From: NeilBrown <neilb@suse.de>
Date: Wed, 14 Nov 2012 23:17:38 +0000 (+1100)
Subject: vpatch: highlight conflicts better.
X-Git-Tag: v1.0~85
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=1b306d76048943a36dbcc1fd399aba2feb13ebfc;p=wiggle.git

vpatch: highlight conflicts better.

You can only tell the difference between a conflict and a
change by the conflict starting with '|', not '-'.
So make that '|' more visible, because conflicts are important.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/vpatch.c b/vpatch.c
index 97f8f95..975b4a3 100644
--- a/vpatch.c
+++ b/vpatch.c
@@ -885,7 +885,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;
+			tag_attr = a_delete | A_REVERSE;
 		}
 		mode &= (ORIG|BEFORE);
 		break;