merge-recursive: increase marker length with depth of recursion
authorElijah Newren <newren@gmail.com>
Thu, 8 Nov 2018 04:40:24 +0000 (20:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Nov 2018 05:23:53 +0000 (14:23 +0900)
commitb2a7942...8bcf397d9a5d3bb6671853755e14de60
treebc05eff...994913792f1abcd745451e9e1f315ec5copy hash to clipboard (tree)
parentb28eeb3...92fd12e24485fbadebfa57df457dd09acopy hash to clipboard (diff)
ll-merge.c
ll-merge.h
merge-recursive.c
t/t6036-recursive-corner-cases.sh