This series adds a few more cleanups on top of en/merge-cleanup.
Changes since v1:
- Removed two patches that will instead be included in a follow-on
series, as suggested by Junio.
- Incorporated commit message cleanups (capitalization and indents)
made by Junio to the previous round.
Elijah Newren (2):
merge-recursive: improve auto-merging messages with path collisions
merge-recursive: avoid showing conflicts with merge branch before HEAD
merge-recursive.c | 37 ++++++++++++++++++++++++++++---
t/t6036-recursive-corner-cases.sh | 8 +++----
2 files changed, 38 insertions(+), 7 deletions(-)
--
2.19.1.280.g0c175526bf
