diff options
Diffstat (limited to 't/t7600-merge.sh')
| -rwxr-xr-x | t/t7600-merge.sh | 3 |
1 files changed, 1 insertions, 2 deletions
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 ' |