From 18a9c1106a61e9abfcf74bc2725532ebf6ce9c7b Mon Sep 17 00:00:00 2001 From: Markus Heidelberg Date: Mon, 2 Feb 2009 14:34:53 +0100 Subject: [PATCH] git-merge-vim-runtime: change comment for the standard handler --- git-merge-vim-runtime.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git-merge-vim-runtime.sh b/git-merge-vim-runtime.sh index c888f424..65f97869 100755 --- a/git-merge-vim-runtime.sh +++ b/git-merge-vim-runtime.sh @@ -37,10 +37,11 @@ case "${1:-.}${2:-.}${3:-.}" in exec git update-index --add --cacheinfo "$6" "$2" "$4" ;; -*) # -# For all the other cases run the standard handler +# All the other cases # +*) + # run the standard handler exec git merge-one-file "$1" "$2" "$3" "$4" "$5" "$6" "$7" ;; esac -- 2.11.4.GIT