Merge branch 'pb/trim-trailing-spaces' into maint
commitcbf4e024ad021501f2c1824b8ae5f7b887a652f1
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Jul 2014 18:10:52 +0000 (10 11:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Jul 2014 18:10:52 +0000 (10 11:10 -0700)
treee280cc76805ab8815ac1ba3d3d129764c11c10ac
parentf35392b0188ce5ac1711be37dca773a85cb32863
parent97c1364be6b27a6faf046d6d4240a4ebd550ae9f
Merge branch 'pb/trim-trailing-spaces' into maint

* pb/trim-trailing-spaces:
  t0008: do not depend on 'echo' handling backslashes specially
  dir.c:trim_trailing_spaces(): fix for " \ " sequence