X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSolverGit.pm;h=5ac27988591c961a9335735727d8b3cf80f825a4;hb=aa1e96cd44f6d5cd77a96648ac1f2dbcca9dc367;hp=eab8459bc341935545b2e28b4e92ce0a22958b93;hpb=0563ed29d37ae46733e3001f390bb9a1c5b04d6b;p=public-inbox.git diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm index eab8459b..5ac27988 100644 --- a/lib/PublicInbox/SolverGit.pm +++ b/lib/PublicInbox/SolverGit.pm @@ -155,7 +155,7 @@ sub extract_diff ($$) { # the meat of the diff, including "^\\No newline ..." # We also allow for totally blank lines w/o leading spaces, # because git-apply(1) handles that case, too - (?:^(?:[\@\+\x20\-\\][^\r\n]*|)$LF)+ + (?:^(?:[\@\+\x20\-\\][^\n]*|)$LF)+ )!smx or return; my $di = {