t6022: Add tests with both rename source & dest involved in D/F conflicts
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:39 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:36 +0000 (17:32 -0700)
commit588504b...94133cba85982fbace532d2156f859eb
tree7d47cc5...92a65e3eb5a66f0ac5a44afff0c79125copy hash to clipboard (tree)
parent3398f2f...8317e1a22093a0149a5eae1fe208b024copy hash to clipboard (diff)
t/t6022-merge-rename.sh