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 97f8f957c5cd0fb4f85def116d35c05445a6f6f2..975b4a3496d259900fc96d653d2e3c86f3f2d884 100644 (file)
--- 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;