From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 May 2012 18:19:27 +0000 (-0700)
Subject: Merge branch 'jc/diff-algo-cleanup' into maint
X-Git-Tag: v1.7.10.2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8daff716ad6caee55e04e5550137cd3bd83b9822;p=git.git

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
---

8daff716ad6caee55e04e5550137cd3bd83b9822