X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge.sh;h=477002910ede7f6bc6bcb9a79f6ddebd248f6bd2;hb=af0e4ac0ecf7cad57d9405f188ce0944e7f9b166;hp=ba42260426296b63070a1fbdc22a9b77ea5ac412;hpb=1ed4813f7d018eb35187209d43b98746a2e69542;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index ba4226042..477002910 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -8,6 +8,9 @@ USAGE='[-n] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commi
 . git-sh-setup
 set_reflog_action "merge $*"
 
+test -z "$(git ls-files -u)" ||
+	die "You are in a middle of conflicted merge."
+
 LF='
 '