summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-05-22 12:41:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-22 12:41:45 -0700
commitb54301bdadfd3195d64e95ef6f58dfdf102e3d26 (patch)
treed1b57b45c3789da04a1707220a6ec0cba8f6b4ed /git-mergetool.sh
parentMerge branch 'jk/skip-http-tests-under-no-curl' (diff)
parentcontrib/subtree: portability fix for string printing (diff)
downloadtgif-b54301bdadfd3195d64e95ef6f58dfdf102e3d26.tar.xz
Merge branch 'dl/subtree-avoid-tricky-echo'
"git subtree" script (in contrib/) used "echo -n" to produce progress messages in a non-portable way. * dl/subtree-avoid-tricky-echo: contrib/subtree: portability fix for string printing
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions