t6042: add tests for consistency in file collision conflict handling
authorElijah Newren <newren@gmail.com>
Thu, 8 Nov 2018 04:40:22 +0000 (20:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Nov 2018 05:23:53 +0000 (14:23 +0900)
commitbb05c9f...595274bcfabf775ea51b4765c503b055
tree55961bc...21036d927f3f2e6e91f57a92c0595d1fcopy hash to clipboard (tree)
parent4f44545...136b8c3575bc4d4c45fc9b7930688a5ccopy hash to clipboard (diff)
t/t6042-merge-rename-corner-cases.sh