diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-24 05:51:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-24 05:51:38 (GMT) |
| commit | 5dc1308562ab5991ecada68b06707709bea408c9 (patch) | |
| tree | 321b8d7310c01d8b01584377d9aba448952a7384 /xdiff/xprepare.c | |
| parent | f3d6073e02f8ee8dc6376b0262151dbbfbbdfe7d (diff) | |
| parent | cc545709253fe8440db2648cb5c771e5b126bdb5 (diff) | |
| download | git-5dc1308562ab5991ecada68b06707709bea408c9.zip git-5dc1308562ab5991ecada68b06707709bea408c9.tar.gz git-5dc1308562ab5991ecada68b06707709bea408c9.tar.bz2 | |
Merge branch 'js/patience-diff'
* js/patience-diff:
bash completions: Add the --patience option
Introduce the diff option '--patience'
Implement the patience diff algorithm
Conflicts:
contrib/completion/git-completion.bash
Diffstat (limited to 'xdiff/xprepare.c')
| -rw-r--r-- | xdiff/xprepare.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c index a43aa72..1689085 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); |