Skip to content

Commit b325680

Browse files
Martin von Zweigbergkgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b3e4847 commit b325680

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-rebase--merge.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ call_merge () {
7878
die "$resolvemsg"
7979
;;
8080
2)
81-
echo "Strategy: $rv $strategy failed, try another" 1>&2
81+
echo "Strategy: $strategy failed, try another" 1>&2
8282
die "$resolvemsg"
8383
;;
8484
*)

0 commit comments

Comments
 (0)