X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7600-merge.sh;h=cde8390c1b9df6e6537a3538d8da11511b6644ec;hb=a660534e06147f8867d6c9b6c41025427a7b5c6c;hp=57f6d2bae7c63f13ee18e11737dbdcc0c080ab10;hpb=712d352577012d5035da69bbf49ea0f0df8bb7da;p=git.git

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 57f6d2bae..cde8390c1 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -554,8 +554,7 @@ test_debug 'gitk --all'
 
 test_expect_success 'refresh the index before merging' '
 	git reset --hard c1 &&
-	sleep 1 &&
-	touch file &&
+	cp file file.n && mv -f file.n file &&
 	git merge c3
 '