diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-08 22:36:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-08 22:36:23 -0700 |
| commit | 301c4f970913fc52be7a6b667fb5a4945e9276d0 (patch) | |
| tree | 8652467db21d479e084282c86e1c0301286d7524 /t/t7600-merge.sh | |
| parent | a9eb30412942224c1494357f495b8b2a4b3d46b8 (diff) | |
| parent | 016e5ff24345f974a084375da83ee143b5f2772d (diff) | |
| download | git-301c4f970913fc52be7a6b667fb5a4945e9276d0.tar.gz git-301c4f970913fc52be7a6b667fb5a4945e9276d0.tar.xz | |
Merge branch 'jc/test-sleepless'
* jc/test-sleepless:
war on "sleep" in tests
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 ' |