Submitter | phabricator |
---|---|
Date | Oct. 13, 2017, 2:05 p.m. |
Message ID | <06d4e58492c3c29c95d26f3fee374787@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/24822/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/mercurial/mpatch.c b/mercurial/mpatch.c --- a/mercurial/mpatch.c +++ b/mercurial/mpatch.c @@ -78,8 +78,7 @@ /* save this hunk */ offset += s->start + s->len - s->end; *d++ = *s++; - } - else { + } else { /* break up this hunk */ c = cut - offset; if (s->end < c) @@ -122,8 +121,7 @@ if (postend <= cut) { offset += s->start + s->len - s->end; s++; - } - else { + } else { c = cut - offset; if (s->end < c) c = s->end;