From: Junio C Hamano <junkio@cox.net>
Date: Sat, 15 Apr 2006 05:58:17 +0000 (-0700)
Subject: Merge branch 'dl/xdiff'
X-Git-Tag: v1.3.0-rc4~1
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=170abc81a0f7bc02702189bacf7eeab74223d922;p=git.git

Merge branch 'dl/xdiff'

* dl/xdiff:
  xdiff: post-process hunks to make them consistent.
---

170abc81a0f7bc02702189bacf7eeab74223d922