aboutsummaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 477002910..3eef048ef 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -7,6 +7,7 @@ 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."