X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff%2Fxdiffi.c;h=3e97462bdd2ed72b4ec60a1eb3869e516609867b;hb=a51609a1c1bdbcf87715d5bae08444d7185d49db;hp=9d0324a38c2a1974648e67161fa0ed1b0f811233;hpb=919ab6429aab9af44feea0768feef80f3092e9d3;p=git.git diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c index 9d0324a38..3e97462bd 100644 --- a/xdiff/xdiffi.c +++ b/xdiff/xdiffi.c @@ -329,6 +329,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;