diff options
Diffstat (limited to 'git-rebase--merge.sh')
| -rw-r--r-- | git-rebase--merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index eb0f7bc157..26afc75cc7 100644 --- 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" ;; *) |