Merge branch 'maint'

[git.git] / xdiff / xdiffi.c

diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 9d0324a38c2a1974648e67161fa0ed1b0f811233..02184d9cde2e27d14c8c2845d7e2c4eb7f0c9b09 100644 (file)
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -293,15 +293,14 @@ int xdl_recs_cmp(diffdata_t *dd1, long off1, long lim1,
                for (; off1 < lim1; off1++)
                        rchg1[rindex1[off1]] = 1;
        } else {
-               long ec;
                xdpsplit_t spl;
                spl.i1 = spl.i2 = 0;
 
                /*
                 * Divide ...
                 */
-               if ((ec = xdl_split(ha1, off1, lim1, ha2, off2, lim2, kvdf, kvdb,
-                                   need_min, &spl, xenv)) < 0) {
+               if (xdl_split(ha1, off1, lim1, ha2, off2, lim2, kvdf, kvdb,
+                             need_min, &spl, xenv) < 0) {
 
                        return -1;
                }
@@ -329,6 +328,9 @@ int xdl_do_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
        xdalgoenv_t xenv;
        diffdata_t dd1, dd2;
 
+       if (xpp->flags & XDF_PATIENCE_DIFF)
+               return xdl_do_patience_diff(mf1, mf2, xpp, xe);
+
        if (xdl_prepare_env(mf1, mf2, xpp, xe) < 0) {
 
                return -1;