summaryrefslogtreecommitdiff
path: root/merge-blobs.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-06-09 11:27:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-06-09 11:27:47 -0700
commit53b4d8387bb75a9b84ef67a72dc4e1587dbb6192 (patch)
treeb12ee533083496a82da61c3ad61bed8373190cc9 /merge-blobs.c
parentMerge branch 'na/no-http-test-in-the-middle' (diff)
parentdir.c:trim_trailing_spaces(): fix for " \ " sequence (diff)
downloadtgif-53b4d8387bb75a9b84ef67a72dc4e1587dbb6192.tar.xz
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
Diffstat (limited to 'merge-blobs.c')
0 files changed, 0 insertions, 0 deletions