oppi.li / go-gitdiff
fork of go-gitdiff with jj support
fork atom
go-gitdiff / gitdiff / testdata / apply / text_fragment_error_context_conflict.patch
at main 314 B view raw
1diff --git a/gitdiff/testdata/apply/text_fragment_error.src b/gitdiff/testdata/apply/text_fragment_error.src 2--- a/gitdiff/testdata/apply/text_fragment_error.src 3+++ b/gitdiff/testdata/apply/text_fragment_error.src 4@@ -4,7 +4,7 @@ line 3 5 line 4 6 line 5 7 line conflict 8-line 7 9+new line a 10 line 8 11 line 9 12 line 10