summaryrefslogtreecommitdiff
path: root/t/t3200-branch.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-11-05 12:18:11 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-11-05 12:18:11 -0800
commit5e6154fb145d66af36e10ef4db7e1d1e9502c501 (patch)
tree98e62ba6a698d6a4ed266b98e9a95bc5fe1b1c1a /t/t3200-branch.sh
parentMerge branch 'js/imap-send-curl-compilation-fix' into maint (diff)
parentmerge: detect delete/modechange conflict (diff)
downloadtgif-5e6154fb145d66af36e10ef4db7e1d1e9502c501.tar.xz
Merge branch 'jk/delete-modechange-conflict' into maint
Merging a branch that removes a path and another that changes the mode bits on the same path should have conflicted at the path, but it didn't and silently favoured the removal. * jk/delete-modechange-conflict: merge: detect delete/modechange conflict t6031: generalize for recursive and resolve strategies t6031: move triple-rename test to t3030
Diffstat (limited to 't/t3200-branch.sh')
0 files changed, 0 insertions, 0 deletions