summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-03 09:43:44 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-03 09:43:44 -0700
commit9502751181df4a1347b3bd0fe2f0f0cde9cfaa91 (patch)
treedaaf6620e5c56375773b5fa9cd495a106f89739e /git-mergetool.sh
parent460645a8c331196c3e5e61de4acf3f9c5803e335 (diff)
parent5a12c8864b9485351547a45fc759dde30dd1d870 (diff)
downloadgit-9502751181df4a1347b3bd0fe2f0f0cde9cfaa91.tar.gz
Merge branch 'jn/apply-filename-with-sp'
* jn/apply-filename-with-sp: apply: handle traditional patches with space in filename tests: exercise "git apply" with weird filenames apply: split quoted filename handling into new function
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions