ll-merge: use a longer conflict marker for internal merge
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Apr 2016 22:35:09 +0000 (15:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 May 2016 22:42:16 +0000 (15:42 -0700)
commitd694a17...86a28bbc19e2a6c32404ca24572e400f
treed6fe8a5...fb759e62dcb10143124ad3a695aed152copy hash to clipboard (tree)
parented34567...7bb1f3747255ca0301b84abad6d06712copy hash to clipboard (diff)
ll-merge.c
t/t6024-recursive-merge.sh
t/t6036-recursive-corner-cases.sh