diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2009-01-01 16:39:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-07 21:37:07 (GMT) |
| commit | 34292bddb861f3cb52a524fdce67234430a744fe (patch) | |
| tree | 9a74c749c894ff44233e024ba16e24c5c18ca9cc /Makefile | |
| parent | 92b7de93fb7801570ddc3195f03f30b9c201a3bd (diff) | |
| download | git-34292bddb861f3cb52a524fdce67234430a744fe.zip git-34292bddb861f3cb52a524fdce67234430a744fe.tar.gz git-34292bddb861f3cb52a524fdce67234430a744fe.tar.bz2 | |
Introduce the diff option '--patience'
This commit teaches Git to produce diff output using the patience diff
algorithm with the diff option '--patience'.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 |