t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:40 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:36 +0000 (17:32 -0700)
commit52304ec...df9458dcf4321c89c96a5e1bc025676d
tree677072e...733d475d02132a8e002aee85b2d223fecopy hash to clipboard (tree)
parent588504b...94133cba85982fbace532d2156f859ebcopy hash to clipboard (diff)
t/t6022-merge-rename.sh