changeset 34634 | 2e08b69bcd29 |
parent 34633 | 347c0f4232e1 |
child 34800 | 761355833867 |
--- a/mercurial/mpatch.c Wed Oct 04 10:55:51 2017 -0400 +++ b/mercurial/mpatch.c Wed Oct 04 10:57:23 2017 -0400 @@ -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;