X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull.sh;h=c184fb81a4dab622d79120bcc986c3bf2b07df7f;hb=2eff14259ea4035dc5f8a18f5998e88dd4da207e;hp=28d08195f0c84b7f3a89a5c5cff9945bb64ddfb3;hpb=b11bd57a384a7bee21245d3895d77d20c33e4d78;p=git.git

diff --git a/git-pull.sh b/git-pull.sh
index 28d08195f..c184fb81a 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -9,6 +9,9 @@ LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEA
 . git-sh-setup
 set_reflog_action "pull $*"
 
+test -z "$(git ls-files -u)" ||
+	die "You are in a middle of conflicted merge."
+
 strategy_args= no_summary= no_commit= squash=
 while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
 do