diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-03 23:46:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-03 23:46:02 -0800 |
| commit | 423325a2d24638ddcc82ce47be5e40be550f4507 (patch) | |
| tree | 00960b001d786299d3da04a4467bd0c798bf8cda /git-merge.sh | |
| parent | 93dcab2937624ebb97f91807576cddb242a55a46 (diff) | |
| parent | d79374c7b58d3814ffdc277de608243f8e665e3a (diff) | |
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index d352a3cf65..a221daa7f4 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -273,7 +273,8 @@ fi case "$best_strategy" in '') restorestate - die "No merge strategy handled the merge." + echo >&2 "No merge strategy handled the merge." + exit 2 ;; "$wt_strategy") # We already have its result in the working tree. |