mergetool: Add support for vimdiff.

diff --git a/git-checkout.sh b/git-checkout.sh
index fcadf200ee990f195ce3f5c72306cbf0206277cd..39ffa8b8a3322b623a6d4938d566453fe206ca69 100755 (executable)
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -89,7 +89,7 @@ while [ "$#" != "0" ]; do
     esac
 done
 
-case "$new_branch,$track" in
+case "$newbranch,$track" in
 ,--*)
        die "git checkout: --track and --no-track require -b"
 esac