From 974ce8078c9a91190d798eaa65c9f173dd50c3f8 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Fri, 4 Aug 2017 23:49:05 -0700 Subject: scripts: use "git foo" not "git-foo" 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 Signed-off-by: Junio C Hamano --- git-merge-resolve.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git-merge-resolve.sh') 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 -- cgit v1.2.3