X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft6022-merge-rename.sh;h=5ac25647abd366f04867a5acec6a987f314c2ace;hb=16a4c6ee0d9a3d07d4d0afbbc4e3467e78065eca;hp=a2d24b5ca95d971eccbb913c2a0eb84b7e87cd10;hpb=f0b0af1b04f558b684cae2a3b805ca4bab84d45f;p=git.git diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh index a2d24b5c..5ac25647 100755 --- a/t/t6022-merge-rename.sh +++ b/t/t6022-merge-rename.sh @@ -111,6 +111,7 @@ test_expect_success 'pull renaming branch into unrenaming one' \ test_expect_success 'pull renaming branch into another renaming one' \ ' + rm -f B git reset --hard git checkout red git pull . white && {