diff options
| -rw-r--r-- | git-resolve-script | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/git-resolve-script b/git-resolve-script index 74fb2875b5..cd6e25a8a2 100644 --- a/git-resolve-script +++ b/git-resolve-script @@ -47,7 +47,11 @@ merge_msg="Merge of $merge_repo" result_tree=$(git-write-tree 2> /dev/null) if [ $? -ne 0 ]; then echo "Simple merge failed, trying Automatic merge" - git-merge-cache git-merge-one-file-script -a + git-merge-cache -o git-merge-one-file-script -a + if [ $? -ne 0 ]; then + echo "Automatic merge failed, fix up by hand" + exit 1 + fi merge_msg="Automatic merge of $merge_repo" result_tree=$(git-write-tree) || exit 1 fi |