summaryrefslogtreecommitdiff
path: root/t/t7611-merge-abort.sh
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2020-08-03 18:41:20 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-03 11:48:15 -0700
commit00906d6f227b259ac7c8cebd07bbea0ba4792185 (patch)
treebb7e3eef976686f2fcf1d0d8330be8b68c283036 /t/t7611-merge-abort.sh
parentmerge: make merge.renormalize work for all uses of merge machinery (diff)
downloadtgif-00906d6f227b259ac7c8cebd07bbea0ba4792185.tar.xz
checkout: support renormalization with checkout -m <paths>
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7611-merge-abort.sh')
0 files changed, 0 insertions, 0 deletions