Re: [PATCH 2/5] merge-recursive: fix numerous argument alignment issues

2018-05-21 Thread Elijah Newren
Hi Dscho, On Mon, May 21, 2018 at 6:42 AM, Johannes Schindelin wrote: > Hi Elijah, > > On Fri, 18 May 2018, Elijah Newren wrote: > >> Various refactorings throughout the code have left lots of alignment >> issues that were driving me crazy; fix them. > > I hope you did not do that manually. What

Re: [PATCH 2/5] merge-recursive: fix numerous argument alignment issues

2018-05-21 Thread Johannes Schindelin
Hi Elijah, On Fri, 18 May 2018, Elijah Newren wrote: > Various refactorings throughout the code have left lots of alignment > issues that were driving me crazy; fix them. I hope you did not do that manually. What is your code formatting tool of choice? The patch looks obviously good to me. Cia

[PATCH 2/5] merge-recursive: fix numerous argument alignment issues

2018-05-18 Thread Elijah Newren
Various refactorings throughout the code have left lots of alignment issues that were driving me crazy; fix them. Signed-off-by: Elijah Newren --- merge-recursive.c | 47 --- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/merge-recursi