rebase -m: don't print exit code 2 when merge fails

When the merge strategy fails, a message suggesting the user to try
another strategy is displayed. Remove the "$rv" (which is always equal
to "2" in this case) from that message.

Signed-off-by: Martin von Zweigbergk <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index eb0f7bc1578fcbfbe6361bf5654a90582ba6a8ac..26afc75cc7d0fbf3de69325043130836c32454a0 100644 (file)
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -78,7 +78,7 @@ call_merge () {
                die "$resolvemsg"
                ;;
        2)
-               echo "Strategy: $rv $strategy failed, try another" 1>&2
+               echo "Strategy: $strategy failed, try another" 1>&2
                die "$resolvemsg"
                ;;
        *)