mode == 0 means "conflict", and just because a conflict has been split does not mean that the latter half is no conflict. Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> --- xdiff/xmerge.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c index 04f2795..7b85aa5 100644 --- a/xdiff/xmerge.c +++ b/xdiff/xmerge.c @@ -228,6 +228,7 @@ static int xdl_refine_conflicts(xdfenv_t m2->next = m->next; m->next = m2; m = m2; + m->mode = 0; m->i1 = xscr->i1 + i1; m->chg1 = xscr->chg1; m->i2 = xscr->i2 + i2; -- 1.4.4.g5aac-dirty - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html