From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 9 Oct 2008 17:24:24 +0000 (-0700)
Subject: Merge branch 'bc/xdiffnl'
X-Git-Tag: v1.6.1-rc1~160
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bc36540e6e1c94cefc1dc1a201800e832eb99194;p=git.git

Merge branch 'bc/xdiffnl'

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

bc36540e6e1c94cefc1dc1a201800e832eb99194