diff options
Diffstat (limited to 'git-resolve.sh')
-rwxr-xr-x | git-resolve.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-resolve.sh b/git-resolve.sh index 926307005..b53ede8d8 100755 --- a/git-resolve.sh +++ b/git-resolve.sh @@ -50,6 +50,9 @@ case "$common" in ;; esac +# We are going to make a new commit. +git var GIT_COMMITTER_IDENT >/dev/null || exit + # Find an optimum merge base if there are more than one candidates. LF=' ' |