summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2016-07-25 21:14:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-26 13:56:57 -0700
commitfbd3199a6d8c6b3fd1e9aa0034cee9a0c6a9bfb4 (patch)
tree8eece42b9159c5cc88258d645d11a887eeb3e14e /contrib/examples/git-merge-ours.sh
parentGit 2.9 (diff)
downloadtgif-fbd3199a6d8c6b3fd1e9aa0034cee9a0c6a9bfb4.tar.xz
t7900-subtree.sh: fix quoting and broken && chains
Allow whitespace in arguments to subtree_test_create_repo. Add missing && chains. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions