diff options
| author | Peter Anvin <hpa@tazenda.sc.orionmulti.com> | 2005-10-03 16:42:45 -0700 |
|---|---|---|
| committer | Peter Anvin <hpa@tazenda.sc.orionmulti.com> | 2005-10-03 16:42:45 -0700 |
| commit | b23f02ee7aa3fc1cdaf6aebde9b731f22671251b (patch) | |
| tree | 0bb59f24e42da48d729f94fb5cc6efdbf2a33129 /git-merge-resolve.sh | |
| parent | c8c5b21a3714db3272f869c82f3ce862ed9c2cc6 (diff) | |
| parent | 17222001273b817aa9655744a0033619134b1a2c (diff) | |
| download | git-b23f02ee7aa3fc1cdaf6aebde9b731f22671251b.tar.gz | |
Merge with master.kernel.org:/pub/scm/git/git.git
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." |