diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-18 00:36:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-18 00:36:06 (GMT) |
| commit | ca01600306863ecfa8bbef769b8e1386cb149785 (patch) | |
| tree | 30507da396d4a19240aed15c47a2f4356dd3987d /Makefile | |
| parent | 2f5cb6aa1e2eb7b12df85d5ddc4d8bc79be47b3d (diff) | |
| parent | 6486a84cb8e69ddf03b2139db3d968400e05f5b3 (diff) | |
| download | git-ca01600306863ecfa8bbef769b8e1386cb149785.zip git-ca01600306863ecfa8bbef769b8e1386cb149785.tar.gz git-ca01600306863ecfa8bbef769b8e1386cb149785.tar.bz2 | |
Merge branch 'rc/histogram-diff'
* rc/histogram-diff:
xdiff/xhistogram: drop need for additional variable
xdiff/xhistogram: rely on xdl_trim_ends()
xdiff/xhistogram: rework handling of recursed results
xdiff: do away with xdl_mmfile_next()
Make test number unique
xdiff/xprepare: use a smaller sample size for histogram diff
xdiff/xprepare: skip classification
teach --histogram to diff
t4033-diff-patience: factor out tests
xdiff/xpatience: factor out fall-back-diff function
xdiff/xprepare: refactor abort cleanups
xdiff/xprepare: use memset()
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1876,7 +1876,7 @@ ifndef NO_CURL GIT_OBJS += http.o http-walker.o remote-curl.o endif XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \ - xdiff/xmerge.o xdiff/xpatience.o + xdiff/xmerge.o xdiff/xpatience.o xdiff/xhistogram.o VCSSVN_OBJS = vcs-svn/string_pool.o vcs-svn/line_buffer.o \ vcs-svn/repo_tree.o vcs-svn/fast_export.o vcs-svn/svndump.o VCSSVN_TEST_OBJS = test-obj-pool.o test-string-pool.o \ |