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 44aa898bba1494b97b55fa001839e4be6d997b70..93102bc0ec9eb20399108309422438a4aee62f7f 100644 (file)
--- 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 &&