aboutsummaryrefslogtreecommitdiff
path: root/xdiff/xdiffi.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-15 22:51:14 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-15 22:51:15 -0700
commit86c340e08287c0faad8871207787e5819f22a7d5 (patch)
treeee05a1f8d8fdf038e385de68ecc107793c123eb5 /xdiff/xdiffi.h
parent9eefd8ae8a955f470d931c13b8711d98f4e9d56e (diff)
parent307ab20b333d9b4c818b1ff912e86944d1a3fdc1 (diff)
downloadgit-86c340e08287c0faad8871207787e5819f22a7d5.tar.gz
git-86c340e08287c0faad8871207787e5819f22a7d5.tar.xz
Merge branch 'jc/diff-algo-cleanup'
Resurrects the preparatory clean-up patches from another topic that was discarded, as this would give a saner foundation to build on diff.algo configuration option series. * jc/diff-algo-cleanup: xdiff: PATIENCE/HISTOGRAM are not independent option bits xdiff: remove XDL_PATCH_* macros
Diffstat (limited to 'xdiff/xdiffi.h')
0 files changed, 0 insertions, 0 deletions