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

Junio C Hamano committed May 11, 2012 at 11:19 UTC 8daff716ad6caee55e04e5550137cd3bd83b9822

No changes.