X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge.sh;h=4afcd95316c01e5d1811184c615c4da574ab0717;hb=d58c6184e345b9c8c8bfe8cc3eb1bbfe2f5ee4f9;hp=498c938c4507ccdc27f5a9e30e85f013a067c876;hpb=cc58fc0684396c5298b21c97f00a568e46224258;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 498c938c4..4afcd9531 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -294,7 +294,7 @@ f,*)
 	git-update-index --refresh 2>/dev/null
 	new_head=$(git-rev-parse --verify "$1^0") &&
 	git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
-	finish "$new_head" "Fast forward"
+	finish "$new_head" "Fast forward" || exit
 	dropsave
 	exit 0
 	;;