X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=xdiff%2Fxprepare.c;h=16890852350cb62bb9f9aec5e52eea8ba46f1192;hb=5ab2f7b2ce8c51e8c47a4cc57c30fa7cae239005;hp=a43aa72cd088af07b13a6bc8de304ecc178047e5;hpb=ed56049058284d7df2ede1ce5f494a2a9a109479;p=git.git

diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c
index a43aa72cd..168908523 100644
--- a/xdiff/xprepare.c
+++ b/xdiff/xprepare.c
@@ -290,7 +290,8 @@ int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
 
 	xdl_free_classifier(&cf);
 
-	if (xdl_optimize_ctxs(&xe->xdf1, &xe->xdf2) < 0) {
+	if (!(xpp->flags & XDF_PATIENCE_DIFF) &&
+			xdl_optimize_ctxs(&xe->xdf1, &xe->xdf2) < 0) {
 
 		xdl_free_ctx(&xe->xdf2);
 		xdl_free_ctx(&xe->xdf1);