From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Jul 2018 19:20:27 +0000 (-0700)
Subject: Merge branch 'en/merge-recursive-cleanup'
X-Git-Tag: v2.19.0-rc0~167
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=473b8bb3aa01fb214c9905456f1f33c9c7def6b3;p=thirdparty%2Fgit.git

Merge branch 'en/merge-recursive-cleanup'

Code cleanup.

* en/merge-recursive-cleanup:
  merge-recursive: add pointer about unduly complex looking code
  merge-recursive: rename conflict_rename_*() family of functions
  merge-recursive: clarify the rename_dir/RENAME_DIR meaning
  merge-recursive: align labels with their respective code blocks
  merge-recursive: fix numerous argument alignment issues
  merge-recursive: fix miscellaneous grammar error in comment
---

473b8bb3aa01fb214c9905456f1f33c9c7def6b3