summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-23 21:51:38 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-23 21:51:38 -0800
commit5dc1308562ab5991ecada68b06707709bea408c9 (patch)
tree321b8d7310c01d8b01584377d9aba448952a7384 /Makefile
parentf3d6073e02f8ee8dc6376b0262151dbbfbbdfe7d (diff)
parentcc545709253fe8440db2648cb5c771e5b126bdb5 (diff)
downloadgit-5dc1308562ab5991ecada68b06707709bea408c9.tar.gz
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--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 270b223adb..b4d9cb4949 100644
--- a/Makefile
+++ b/Makefile
@@ -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