X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff%2Fxprepare.c;h=16890852350cb62bb9f9aec5e52eea8ba46f1192;hb=36612e4daf8b5b5eaf16315aa13c66925f878cd6;hp=a43aa72cd088af07b13a6bc8de304ecc178047e5;hpb=3f3e2c26fa0325f4df952363f8f5046ca8158bb3;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);