undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/t6042-timing-fix'

Browse Source 
Test update.

* js/t6042-timing-fix:
  t6042: work around speed optimization on Windows
This commit is contained in:
Junio C Hamano 2019-02-05 14:26:14 -08:00
commit 3009c8bcca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t6042-merge-rename-corner-cases.sh
View File

@ -1175,7 +1175,7 @@ test_expect_success 'setup nested conflicts from rename/rename(2to1)' '
# Handle the left side # Handle the left side
git checkout L && git checkout L &&
git mv one three && git rm one two &&
mv -f file_v2 three && mv -f file_v2 three &&
mv -f file_v5 two && mv -f file_v5 two &&
git add two three && git add two three &&
@ -1183,7 +1183,7 @@ test_expect_success 'setup nested conflicts from rename/rename(2to1)' '
# Handle the right side # Handle the right side
git checkout R && git checkout R &&
git mv two three && git rm one two &&
mv -f file_v3 one && mv -f file_v3 one &&
mv -f file_v6 three && mv -f file_v6 three &&
git add one three && git add one three &&