From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Apr 2012 05:51:14 +0000 (-0700)
Subject: Merge branch 'jc/diff-algo-cleanup'
X-Git-Tag: v1.7.11-rc0~161
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=86c340e08287c0faad8871207787e5819f22a7d5;p=git-core%2Fgit.git

Merge branch 'jc/diff-algo-cleanup'

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

86c340e08287c0faad8871207787e5819f22a7d5