diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-02-05 14:26:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-05 14:26:14 -0800 |
| commit | 3009c8bccada0980fcc43744a897bf117632e72b (patch) | |
| tree | 63270ed4a52f29106d78b8b8e947fd9a1058ad0b | |
| parent | Merge branch 'jk/add-ignore-errors-bit-assignment-fix' (diff) | |
| parent | t6042: work around speed optimization on Windows (diff) | |
| download | tgif-3009c8bccada0980fcc43744a897bf117632e72b.tar.xz | |
Merge branch 'js/t6042-timing-fix'
Test update.
* js/t6042-timing-fix:
t6042: work around speed optimization on Windows
| -rwxr-xr-x | t/t6042-merge-rename-corner-cases.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh index 7cc34e7579..09dfa8bd92 100755 --- a/t/t6042-merge-rename-corner-cases.sh +++ b/t/t6042-merge-rename-corner-cases.sh @@ -1175,7 +1175,7 @@ test_expect_success 'setup nested conflicts from rename/rename(2to1)' ' # Handle the left side git checkout L && - git mv one three && + git rm one two && mv -f file_v2 three && mv -f file_v5 two && git add two three && @@ -1183,7 +1183,7 @@ test_expect_success 'setup nested conflicts from rename/rename(2to1)' ' # Handle the right side git checkout R && - git mv two three && + git rm one two && mv -f file_v3 one && mv -f file_v6 three && git add one three && |