File fix_conflicts_in_browser of Package wiggle

From 0da9cb2c412ad27802788bdb5e23854f2478dbe6 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Tue, 15 May 2012 19:31:47 +1000
Subject: [PATCH] Browser: fix in_conflict detection while browsing.

I forget to consider 'hi' and 'lo'.

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

diff --git a/vpatch.c b/vpatch.c
index 44aa898..93102bc 100644
--- a/vpatch.c
+++ b/vpatch.c
@@ -577,7 +577,9 @@ 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)
+		if (m[pos.p.m].in_conflict &&
+		    (pos.p.o < m[pos.p.m].lo ||
+		     pos.p.o > m[pos.p.m].hi))
 			rv |= CONFLICTED | CHANGES;
 		e = prev_melmnt(&pos.p, fm, fb, fa, m);
 	} while (e.start != NULL &&