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 /Makefile | |
| 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 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1287,7 +1287,7 @@ $(LIB_FILE): $(LIB_OBJS) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS) XDIFF_OBJS=xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \ - xdiff/xmerge.o + xdiff/xmerge.o xdiff/xpatience.o $(XDIFF_OBJS): xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \ xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h |