summaryrefslogtreecommitdiff
path: root/t/t5613-info-alternate.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-02 15:30:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-02 15:30:43 -0700
commit84e74c64034dafe96edfb7a1f7272daa9149c1e3 (patch)
tree70bff94c286a467fbef66065c27e2bb72c72f290 /t/t5613-info-alternate.sh
parentMerge branch 'sb/object-store-lookup' (diff)
parentt6042: add testcase covering long chains of rename conflicts (diff)
downloadtgif-84e74c64034dafe96edfb7a1f7272daa9149c1e3.tar.xz
Merge branch 'en/t6042-insane-merge-rename-testcases'
Various glitches in the heuristics of merge-recursive strategy have been documented in new tests. * en/t6042-insane-merge-rename-testcases: t6042: add testcase covering long chains of rename conflicts t6042: add testcase covering rename/rename(2to1)/delete/delete conflict t6042: add testcase covering rename/add/delete conflict type
Diffstat (limited to 't/t5613-info-alternate.sh')
0 files changed, 0 insertions, 0 deletions