X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge-resolve.sh;h=966e81ff7d353beb15ac2c9ed9a50a1ea45c876c;hb=23d61f8343282643c830e1c446962b213dbcc09a;hp=e3b04a0e959676e513a7b7e902ea51927d76e2be;hpb=2276aa6c098a0337bc2bec49742e332bdd1b802c;p=git.git

diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index e3b04a0e..966e81ff 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."