summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-12-11 11:14:11 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-12-11 11:14:11 -0800
commit8c0a546670a2cb2349c5baedbf4b87268e52c665 (patch)
tree4e06876cef5346fd73a8428770ba8b0d29e0b44b /t/t3310-notes-merge-manual-resolve.sh
parentMerge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maint (diff)
parentcontrib/subtree: respect spaces in a repository path (diff)
downloadtgif-8c0a546670a2cb2349c5baedbf4b87268e52c665.tar.xz
Merge branch 'as/subtree-with-spaces' into maint
Update "git subtree" (in contrib/) so that it can take whitespaces in the pathnames, not only in the in-tree pathname but the name of the directory that the repository is in. * as/subtree-with-spaces: contrib/subtree: respect spaces in a repository path t7900-subtree: test the "space in a subdirectory name" case
Diffstat (limited to 't/t3310-notes-merge-manual-resolve.sh')
0 files changed, 0 insertions, 0 deletions