]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
merge-recursive: fix numerous argument alignment issues
authorElijah Newren <newren@gmail.com>
Sun, 10 Jun 2018 04:16:12 +0000 (21:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Jun 2018 17:22:57 +0000 (10:22 -0700)
commitd90e759fd5d8c30ab37ecccbaa3a00c85682eaf9
treee61502f387e554cd128fa23eb43a42fb89850332
parent2d6bad918d584bd6bfeb134790cc3233c2283884
merge-recursive: fix numerous argument alignment issues

Various refactorings throughout the code have left lots of alignment
issues that were driving me crazy; fix them.

Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c