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>
Eric Wong committed
Jun 28, 2006 at 02:11 UTC
66eb64cba64a26dbf2b1d4e319d6514696154fee
1 file changed
+3
-8
git-rebase.sh
+3
-8
@@ -34,11 +34,6 @@ When you have resolved this problem run \"git rebase --continue\".
34
If you would prefer to skip this patch, instead run \"git rebase --skip\".
35
To restore the original branch and stop rebasing run \"git rebase --abort\".
36
"
37
-
38
-MRESOLVEMSG="
39
-When you have resolved this problem run \"git rebase --continue\".
40
-To restore the original branch and stop rebasing run \"git rebase --abort\".
41
-"
37
unset newbase
38
strategy=recursive
39
do_merge=
@@ -54,7 +49,7 @@ continue_merge () {
49
then
50
echo "You still have unmerged paths in your index"
51
echo "did you forget update-index?"
57
- die "$MRESOLVEMSG"
52
+ die "$RESOLVEMSG"
53
fi
54
55
if test -n "`git-diff-index HEAD`"
@@ -87,11 +82,11 @@ call_merge () {
82
;;
83
1)
84
test -d "$GIT_DIR/rr-cache" && git-rerere
90
- die "$MRESOLVEMSG"
85
+ die "$RESOLVEMSG"
86
;;
87
2)
88
echo "Strategy: $rv $strategy failed, try another" 1>&2
94
- die "$MRESOLVEMSG"
89
+ die "$RESOLVEMSG"
90
;;
91
*)
92
die "Unknown exit code ($rv) from command:" \