diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-03 16:32:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-03 16:32:57 -0700 |
| commit | 17222001273b817aa9655744a0033619134b1a2c (patch) | |
| tree | 94edd5c69bf891215941f9b55ee573513ddf5c89 /git-merge-resolve.sh | |
| parent | baaac6a7143ad07de62926421f8740cd640c241c (diff) | |
| parent | 619e5a0ed4a53653085961b7aefe1f93ed879949 (diff) | |
| download | git-17222001273b817aa9655744a0033619134b1a2c.tar.gz | |
Merge branch 'fixes'
Diffstat (limited to 'git-merge-resolve.sh')
| -rwxr-xr-x | git-merge-resolve.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh index e3b04a0e95..966e81ff7d 100755 --- a/git-merge-resolve.sh +++ b/git-merge-resolve.sh @@ -31,6 +31,12 @@ case "$remotes" in exit 2 ;; esac +# Give up if this is a baseless merge. +if test '' = "$bases" +then + exit 2 +fi + git-update-index --refresh 2>/dev/null git-read-tree -u -m $bases $head $remotes || exit 2 echo "Trying simple merge." |