mirror of
https://github.com/bluekeyes/go-gitdiff
synced 2026-06-08 13:18:30 +00:00
Billy Keyes
4fa9801742
When applying a text fragment that deletes all content in the file, make sure there is no content left in the source after using all the lines in the fragment. If there is is extra content, it's a conflict: something added more lines to the file after generating the patch.
14 lines
539 B
Diff
14 lines
539 B
Diff
diff --git a/gitdiff/testdata/apply/file_bin_modify.src b/gitdiff/testdata/apply/file_bin_modify.src
|
|
GIT binary patch
|
|
delta 172
|
|
zcmV;d08{^f2)qc8AP{I3VQ>J`s>wb0HU+h#6w8q?tUO~cHmDjZi2<8yZ9XmKhhMdo
|
|
zWu(4bg|8QwzZ|1e*rL4P#)`Fen<n~ik=E?$qG6?hzJ6$u{l5W#?uwHb0q6w)00000
|
|
zlLZ3%0RfW%1N%UMJ{~Z~0@X${&1Kk#98tb3==a{J7A;`O`v&<T@514_mvMTz72b#n
|
|
atf$#NLoPbNe?RPFJVt1aCFGoQbiKD!OHgJ2
|
|
|
|
delta 112
|
|
zcmV-$0FVE?2!IHXAP~DY<7&llQfwqYA%tL<sR@xVtUMD;+4ZG>XTQ5=J2y;^BfB}4
|
|
zWkisH791|vOVl5e-@^VLX0s~Ky_UyN!3;CgPr>Edj0j+0gOSwSsFsr$0q6zUJph<q
|
|
SlLZ3%0XmZb1N#I__7UCuR5Dxu
|
|
|