Print out the edge commits for each packfile in fast-import.

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