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)
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>
No differences found