t6022: Add test combinations of {content conflict?, D/F conflict remains?}
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:37 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:36 +0000 (17:32 -0700)
commitaf6e175...9978eed17c406206e1afc9f0501abf77
tree9617fd4...ee595b35ab528da2d79a33c2ef671c2fcopy hash to clipboard (tree)
parentdf0b99f...0458dd0d442b17d78dd4c171a89f7bb2copy hash to clipboard (diff)
t/t6022-merge-rename.sh