diff options
Diffstat (limited to 'git-resolve-script')
| -rw-r--r-- | git-resolve-script | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-resolve-script b/git-resolve-script index b7ccc20114..4fc7a6dce3 100644 --- a/git-resolve-script +++ b/git-resolve-script @@ -39,13 +39,14 @@ if [ "$common" == "$head" ]; then echo "Destroying all noncommitted data!" echo "Kill me within 3 seconds.." sleep 3 - git-read-tree -m $merge && git-checkout-cache -f -u -a + git-read-tree -m $merge || exit 1 + git-checkout-cache -f -u -a echo $merge > "$GIT_DIR"/HEAD git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat exit 0 fi echo "Trying to merge $merge into $head" -git-read-tree -m $common $head $merge +git-read-tree -m $common $head $merge || exit 1 merge_msg="Merge of $merge_repo" result_tree=$(git-write-tree 2> /dev/null) if [ $? -ne 0 ]; then |