t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:40 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:32 +0000 (14:19 -0700)
commitc696606...fb4d2a2daa130202eeabfd2f08b51fa5
tree63bd7a1...8c36f2242799c571ebd915653773c065copy hash to clipboard (tree)
parentf0b75fc...810abaca317f7d82d25c538da95c6987copy hash to clipboard (diff)
t/t6042-merge-rename-corner-cases.sh