From: Shawn O. Pearce 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.lorimer.id.au/gitweb.git/diff_plain/bc36540e6e1c94cefc1dc1a201800e832eb99194?ds=inline;hp=--cc Merge branch 'bc/xdiffnl' * bc/xdiffnl: xdiff-interface.c: strip newline (and cr) from line before pattern matching --- bc36540e6e1c94cefc1dc1a201800e832eb99194