summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-20 15:53:31 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-20 15:53:31 -0700
commitf9c2d2b14e81d48d3d04f3bb01b1579ee359edb4 (patch)
tree1c680a7b5dffe18723b5a4a84d6475e14445b031 /t/t7610-mergetool.sh
parentf2fef7b55aea64104a6aee662817e1e6f0b22f71 (diff)
parente17dba8fe15028425acd6a4ebebf1b8e9377d3c6 (diff)
downloadgit-f9c2d2b14e81d48d3d04f3bb01b1579ee359edb4.tar.gz
Merge branch 'nd/maint-remote-remove' into maint
* nd/maint-remote-remove: remote: prefer subcommand name 'remove' to 'rm'
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions