Re: [PATCH] merge-recursive: use DIFF_XDL_SET macro

2017-06-30 Thread Junio C Hamano
Stefan Beller writes: > Instead of implementing this on our own, just use a convenience macro. > > Signed-off-by: Stefan Beller > --- Good eyes. Thanks. > merge-recursive.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/merge-recursive.c b/merge-recursive.c >

[PATCH] merge-recursive: use DIFF_XDL_SET macro

2017-06-29 Thread Stefan Beller
Instead of implementing this on our own, just use a convenience macro. Signed-off-by: Stefan Beller --- merge-recursive.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 59e5ee41a8..1494ffdb82 100644 --- a/merge-recursive.c ++