Merge branch 'dl/xdiff'
authorJunio C Hamano <junkio@cox.net>
Sat, 15 Apr 2006 05:58:17 +0000 (22:58 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 15 Apr 2006 05:58:17 +0000 (22:58 -0700)
* dl/xdiff:
  xdiff: post-process hunks to make them consistent.


Trivial merge