Merge branch 'bc/xdiffnl'
commitbc36540e6e1c94cefc1dc1a201800e832eb99194
authorShawn O. Pearce <spearce@spearce.org>
Thu, 9 Oct 2008 17:24:24 +0000 (9 10:24 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 9 Oct 2008 17:24:24 +0000 (9 10:24 -0700)
treea1372a10a6e3054421cdf9244f1644fedb845043
parented187bd5936267744aa579ab1a33f0b07862a74b
parenta5a5a04863036678919705979b9c0f3579fa3710
Merge branch 'bc/xdiffnl'

* bc/xdiffnl:
  xdiff-interface.c: strip newline (and cr) from line before pattern matching