From 25715d910329577ccb75f4e8762d64ffd815a542 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Fri, 23 Aug 2013 11:20:54 +1000 Subject: [PATCH] Browser: disable ignore-blanks after editing. If we leave it enabled, then the result written out can be different to the final edit and print_merge prefers the A stream to the C stream. Disabling it shouldn't hurt as now more cleverness is expected, just viewing of the result. Signed-off-by: NeilBrown --- vpatch.c | 1 + 1 file changed, 1 insertion(+) diff --git a/vpatch.c b/vpatch.c index 063062b..98ff728 100644 --- a/vpatch.c +++ b/vpatch.c @@ -1867,6 +1867,7 @@ static int merge_window(struct plist *p, FILE *f, int reverse, int replace, sb.body = memdup(sm.body, sm.len); } free(sp.body); + ignore_blanks = 0; prepare_merge(0); refresh = 2; changes = 1; -- 2.43.0