diff options
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-merge.sh b/git-merge.sh index ba42260426..477002910e 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=' ' |