X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=xdiff%2Fxmerge.c;h=b83b3348cc3aab66b13cb565a0a0fabaef4b689b;hb=ab002e34e26c39a716dc80359450f739ba907122;hp=294450b89916180ab603d566e7d3f281773a3b92;hpb=1ed4813f7d018eb35187209d43b98746a2e69542;p=git.git

diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c
index 294450b89..b83b3348c 100644
--- a/xdiff/xmerge.c
+++ b/xdiff/xmerge.c
@@ -166,6 +166,8 @@ static int xdl_fill_merge_buffer(xdfenv_t *xe1, const char *name1,
 			size += xdl_recs_copy(xe2, m->i2 - m->i1 + i1,
 					m->i1 + m->chg2 - i1, 0,
 					dest ? dest + size : NULL);
+		else
+			continue;
 		i1 = m->i1 + m->chg1;
 	}
 	size += xdl_recs_copy(xe1, i1, xe1->xdf2.nrec - i1, 0,
@@ -213,9 +215,10 @@ static int xdl_refine_conflicts(xdfenv_t *xe1, xdfenv_t *xe2, xdmerge_t *m,
 			return -1;
 		}
 		if (!xscr) {
-			/* If this happens, it's a bug. */
+			/* If this happens, the changes are identical. */
 			xdl_free_env(&xe);
-			return -2;
+			m->mode = 4;
+			continue;
 		}
 		x = xscr;
 		m->i1 = xscr->i1 + i1;