tree c265e6d3c6a05ce2f72b6058958f4fac14d79731
parent 07e74b0da2896ffa6acb5c33f56d7266b35b7ac9
parent 307ab20b333d9b4c818b1ff912e86944d1a3fdc1
author Junio C Hamano <gitster@pobox.com> 1336760367 -0700
committer Junio C Hamano <gitster@pobox.com> 1336760367 -0700

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