X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6022-merge-rename.sh;h=5ac25647abd366f04867a5acec6a987f314c2ace;hb=69de8cc8527dc45a7aef76e8f1ace45b509b3712;hp=a2d24b5ca95d971eccbb913c2a0eb84b7e87cd10;hpb=4b953cdc04fec8783e2c654a671005492fda9b01;p=git.git

diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index a2d24b5ca..5ac25647a 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 && {