Merge branch 'jc/diff-algo-cleanup' into maint
commit8daff716ad6caee55e04e5550137cd3bd83b9822
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 May 2012 18:19:27 +0000 (11 11:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 May 2012 18:19:27 +0000 (11 11:19 -0700)
treec265e6d3c6a05ce2f72b6058958f4fac14d79731
parent07e74b0da2896ffa6acb5c33f56d7266b35b7ac9
parent307ab20b333d9b4c818b1ff912e86944d1a3fdc1
Merge branch 'jc/diff-algo-cleanup' into maint

* jc/diff-algo-cleanup:
  xdiff: PATIENCE/HISTOGRAM are not independent option bits
  xdiff: remove XDL_PATCH_* macros
diff.c
diff.h
merge-recursive.c