diff --git a/git-merge.sh b/git-merge.sh
index ba42260426296b63070a1fbdc22a9b77ea5ac412..477002910ede7f6bc6bcb9a79f6ddebd248f6bd2 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
. git-sh-setup
set_reflog_action "merge $*"
+test -z "$(git ls-files -u)" ||
+ die "You are in a middle of conflicted merge."
+
LF='
'