Skip to content

t6042: fix breakage on Windows #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dscho wants to merge 1 commit into from
Closed

t6042: fix breakage on Windows #109

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions t/t6042-merge-rename-corner-cases.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,15 +1175,15 @@ 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 &&
test_tick && git commit -m spanish &&

# 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 &&
Expand Down