From: Junio C Hamano Date: Mon, 9 Jun 2014 18:27:47 +0000 (-0700) Subject: Merge branch 'pb/trim-trailing-spaces' X-Git-Tag: v2.1.0-rc0~141 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/53b4d8387bb75a9b84ef67a72dc4e1587dbb6192 Merge branch 'pb/trim-trailing-spaces' Fix an error in parsing of .gitignore files that use a trailing "\ " to mark pathnames that end with a SP. * pb/trim-trailing-spaces: dir.c:trim_trailing_spaces(): fix for " \ " sequence --- 53b4d8387bb75a9b84ef67a72dc4e1587dbb6192