mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
64630d807a
During "git rebase --merge", a conflicted patch could not be skipped with "--skip" if the next one also conflicted. * bc/fix-rebase-merge-skip: rebase--merge: fix --skip with two conflicts in a row
3.7 KiB
3.7 KiB