GIT 0.99.6

[git.git] / git-resolve-script

diff --git a/git-resolve-script b/git-resolve-script
index 7c0e3d8..000cbb8 100755 (executable)
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -36,19 +36,21 @@ if [ -z "$common" ]; then
        die "Unable to find common commit between" $merge $head
 fi
 
-if [ "$common" == "$merge" ]; then
+case "$common" in
+"$merge")
        echo "Already up-to-date. Yeeah!"
        dropheads
        exit 0
-fi
-if [ "$common" == "$head" ]; then
+       ;;
+"$head")
        echo "Updating from $head to $merge."
        git-read-tree -u -m $head $merge || exit 1
        echo $merge > "$GIT_DIR"/HEAD
        git-diff-tree -p $head $merge | git-apply --stat
        dropheads
        exit 0
-fi
+       ;;
+esac
 
 # Find an optimum merge base if there are more than one candidates.
 LF='