Mercurial > hg-stable
changeset 34634:2e08b69bcd29
mpatch: reflow two oddly formatted else blocks with clang-format
Differential Revision: https://phab.mercurial-scm.org/D1029
author | Augie Fackler <augie@google.com> |
---|---|
date | Wed, 04 Oct 2017 10:57:23 -0400 |
parents | 347c0f4232e1 |
children | 3455e2e2ce9b |
files | mercurial/mpatch.c |
diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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;