mirror of
https://github.com/git/git.git
synced 2026-03-15 11:10:07 +01:00
Merge branch 'jc/maint-add-p-overlapping-hunks' into next
* jc/maint-add-p-overlapping-hunks: t3701: add-p-fix makes the last test to pass
This commit is contained in:
@@ -310,7 +310,7 @@ test_expect_success PERL 'split hunk setup' '
|
||||
done >test
|
||||
'
|
||||
|
||||
test_expect_failure PERL 'split hunk "add -p (edit)"' '
|
||||
test_expect_success PERL 'split hunk "add -p (edit)"' '
|
||||
# Split, say Edit and do nothing. Then:
|
||||
#
|
||||
# 1. Broken version results in a patch that does not apply and
|
||||
|
||||
Reference in New Issue
Block a user