t6022: Add tests for reversing order of merges when D/F conflicts present
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:38 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:36 +0000 (17:32 -0700)
commit3398f2f...8317e1a22093a0149a5eae1fe208b024
treefccb1c2...2def788915acecb6de8409ce6414a250copy hash to clipboard (tree)
parentaf6e175...9978eed17c406206e1afc9f0501abf77copy hash to clipboard (diff)
t/t6022-merge-rename.sh