summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2017-08-04 23:49:05 -0700
committerJunio C Hamano <gitster@pobox.com>2017-08-07 12:04:45 -0700
commit974ce8078c9a91190d798eaa65c9f173dd50c3f8 (patch)
tree3ddccb020fb3ba10fbf1e55b1ebc9f2f6ff1b4bd /git-merge-resolve.sh
parent4384e3cde2ce8ecd194202e171ae16333d241326 (diff)
downloadgit-974ce8078c9a91190d798eaa65c9f173dd50c3f8.tar.gz
scripts: use "git foo" not "git-foo"mf/no-dashed-subcommands
We want to make sure that people who copy & paste code would see fewer instances of "git-foo". The use of these dashed forms have been discouraged since v1.6.0 days. Signed-off-by: Michael Forney <mforney@mforney.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
-rwxr-xr-xgit-merge-resolve.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index c9da747fcf..343fe7bccd 100755
--- a/git-merge-resolve.sh
+++ b/git-merge-resolve.sh
@@ -45,7 +45,7 @@ then
exit 0
else
echo "Simple merge failed, trying Automatic merge."
- if git-merge-index -o git-merge-one-file -a
+ if git merge-index -o git-merge-one-file -a
then
exit 0
else