From 34a8badaf23fd53baeb6805f4d26c14f1a95293b Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Fri, 11 May 2012 19:30:22 +1000 Subject: [PATCH] Browser: improve rendering of conflicts in the the 'merge' view. I was ignoring the in_conflict value, so the 'original' side of a conflict wasn't properly displayed, and so looked confusing. Signed-off-by: NeilBrown --- vpatch.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vpatch.c b/vpatch.c index e91078c..f323891 100644 --- a/vpatch.c +++ b/vpatch.c @@ -579,6 +579,8 @@ static int check_line(struct mpos pos, struct file fm, struct file fb, rv |= WIGGLED; else if (m[pos.p.m].type == Unmatched) unmatched = 1; + if (m[pos.p.m].in_conflict) + rv |= CONFLICTED | CHANGES; e = prev_melmnt(&pos.p, fm, fb, fa, m); } while (e.start != NULL && (!ends_mline(e) @@ -845,7 +847,7 @@ static void draw_mside(int mode, int row, int offset, int start, int cols, tag_attr = a_delete; if ((mode & ORIG) && (mode & CONFLICTED)) { tag = '|'; - tag_attr = a_delete | A_UNDERLINE; + tag_attr = a_delete; } mode &= (ORIG|BEFORE); break; -- 2.39.5