Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/t6042-timing-fix'
author
Junio C Hamano
<gitster@pobox.com>
Tue, 5 Feb 2019 22:26:14 +0000
(14:26 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 5 Feb 2019 22:26:14 +0000
(14:26 -0800)
Test update.
* js/t6042-timing-fix:
t6042: work around speed optimization on Windows
t/t6042-merge-rename-corner-cases.sh
patch
|
blob
|
history
raw
(from parent 1:
1c41824
)
diff --git
a/t/t6042-merge-rename-corner-cases.sh
b/t/t6042-merge-rename-corner-cases.sh
index 7cc34e75797b406096407ba1799a1ca54e48333c..09dfa8bd92b51e7a90fcd01f07c62a6fdf65a528 100755
(executable)
--- 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 &&