rebase: get rid of outdated MRESOLVEMSG

There was a time when rebase --skip didn't work when used with
--merge, but that is no more so we don't need that message
anymore.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-rebase.sh b/git-rebase.sh
index 0ac085e14aa5d11ece6a537008578cc7686680ba..fd0e7c498d8cdfe210fd0b34f6b0e7acaf8b381a 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -34,11 +34,6 @@ When you have resolved this problem run \"git rebase --continue\".
 If you would prefer to skip this patch, instead run \"git rebase --skip\".
 To restore the original branch and stop rebasing run \"git rebase --abort\".
 "
 If you would prefer to skip this patch, instead run \"git rebase --skip\".
 To restore the original branch and stop rebasing run \"git rebase --abort\".
 "

-
-MRESOLVEMSG="
-When you have resolved this problem run \"git rebase --continue\".
-To restore the original branch and stop rebasing run \"git rebase --abort\".
-"

 unset newbase
 strategy=recursive
 do_merge=
 unset newbase
 strategy=recursive
 do_merge=


@@ -54,7 +49,7 @@ continue_merge () {
        then
                echo "You still have unmerged paths in your index"
                echo "did you forget update-index?"
        then
                echo "You still have unmerged paths in your index"
                echo "did you forget update-index?"

-               die "$MRESOLVEMSG"
+               die "$RESOLVEMSG"

        fi
 
        if test -n "`git-diff-index HEAD`"
        fi
 
        if test -n "`git-diff-index HEAD`"


@@ -87,11 +82,11 @@ call_merge () {
                ;;
        1)
                test -d "$GIT_DIR/rr-cache" && git-rerere
                ;;
        1)
                test -d "$GIT_DIR/rr-cache" && git-rerere

-               die "$MRESOLVEMSG"
+               die "$RESOLVEMSG"

                ;;
        2)
                echo "Strategy: $rv $strategy failed, try another" 1>&2
                ;;
        2)
                echo "Strategy: $rv $strategy failed, try another" 1>&2

-               die "$MRESOLVEMSG"
+               die "$RESOLVEMSG"

                ;;
        *)
                die "Unknown exit code ($rv) from command:" \
                ;;
        *)
                die "Unknown exit code ($rv) from command:" \