Fix earlier mismerges.

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 157c7e4d6ce470191ca4207aaf1ecbf5cd4c7d75..d15747f1ed8f875a3c1bb7129e50bfbc8d2b033f 100755 (executable)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -30,7 +30,7 @@ $LONG_USAGE"
 fi
 
 case "$1" in
-       --h|--he|--hel|--help)
+       -h|--h|--he|--hel|--help)
        echo "$LONG_USAGE"
        exit
 esac
@@ -42,7 +42,7 @@ then
 
        # Make sure we are in a valid repository of a vintage we understand.
        GIT_DIR="$GIT_DIR" git repo-config --get core.nosuch >/dev/null
-       if test $? == 128
+       if test $? = 128
        then
            exit
        fi