tree f538656ce9c0a4cf543ec6952e3e4af12779d8f8
parent afcb536f288f28bb37acf11a5666a219b8f20200
parent 295ba2fb894be23cd1d1b0b34186e694b8e36076
author Junio C Hamano <junkio@cox.net> 1145080697 -0700
committer Junio C Hamano <junkio@cox.net> 1145080697 -0700

Merge branch 'dl/xdiff'

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