X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6022-merge-rename.sh;h=497ef36ad883e79cd799a4642e0c4414d8550e1c;hb=98526e007e293700fa578da9a0a4459d6b5375b0;hp=1292cafd7f1f7fc30b462d4e07be34383e9d6be9;hpb=ebc12ce5bfcf6401c8fcc7e4935bc50142a65db4;p=git.git diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh index 1292cafd7..497ef36ad 100755 --- a/t/t6022-merge-rename.sh +++ b/t/t6022-merge-rename.sh @@ -105,6 +105,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 && {