diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 57f6d2bae7c63f13ee18e11737dbdcc0c080ab10..cde8390c1b9df6e6537a3538d8da11511b6644ec 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
test_expect_success 'refresh the index before merging' '
git reset --hard c1 &&
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
'
git merge c3
'