merge-recursive: avoid showing conflicts with merge branch before HEAD
authorElijah Newren <newren@gmail.com>
Tue, 16 Oct 2018 20:19:48 +0000 (13:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Oct 2018 05:45:39 +0000 (14:45 +0900)
commit4f44545...136b8c3575bc4d4c45fc9b7930688a5c
tree3c77513...988ef6cdb720fecb6dc39b039d5898d3copy hash to clipboard (tree)
parent2b168ef...ffa308537d858b9910170e4d314a8f4acopy hash to clipboard (diff)
merge-recursive.c
t/t6036-recursive-corner-cases.sh