Merge branch 'jc/diff-algo-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 05:51:14 +0000 (22:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 05:51:15 +0000 (22:51 -0700)
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

1  2 
diff.c
diff.h
merge-recursive.c

diff --cc diff.c
Simple merge
diff --cc diff.h
Simple merge
Simple merge