Merge branch 'dl/xdiff'
commit170abc81a0f7bc02702189bacf7eeab74223d922
authorJunio C Hamano <junkio@cox.net>
Sat, 15 Apr 2006 05:58:17 +0000 (14 22:58 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 15 Apr 2006 05:58:17 +0000 (14 22:58 -0700)
treef538656ce9c0a4cf543ec6952e3e4af12779d8f8
parentafcb536f288f28bb37acf11a5666a219b8f20200
parent295ba2fb894be23cd1d1b0b34186e694b8e36076
Merge branch 'dl/xdiff'

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