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)
commitd90e759...d5d8c30ab37ecccbaa3a00c85682eaf9
treee61502f...87e554cd128fa23eb43a42fb89850332copy hash to clipboard (tree)
parent2d6bad9...8d584bd6bfeb134790cc3233c2283884copy hash to clipboard (diff)
merge-recursive.c