t6022: Add tests for rename/rename combined with D/F conflicts
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:41 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:36 +0000 (17:32 -0700)
commit7079834...4b7dcdd5fe3e09b30d0fdf6dac89c940
treeb8e62ff...c6964f8f2af3c343730aedef47df1c3bcopy hash to clipboard (tree)
parent52304ec...df9458dcf4321c89c96a5e1bc025676dcopy hash to clipboard (diff)
t/t6022-merge-rename.sh