Merge branch 'pb/trim-trailing-spaces'
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Jun 2014 18:27:47 +0000 (11:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jun 2014 18:27:47 +0000 (11:27 -0700)
commit53b4d8387bb75a9b84ef67a72dc4e1587dbb6192
treeb12ee533083496a82da61c3ad61bed8373190cc9
parent0908b6dfc307b68822a00b9263293dd516d609d3
parente61a6c1d8272f9d7bdc861ed28bfac5fb7e33556
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