3 # Copyright (c) 2005 Linus Torvalds
4 # Copyright (c) 2005 Junio C Hamano
6 # Resolve two trees, using enhanced multi-base read-tree.
8 # The first parameters up to -- are merge bases; the rest are heads.
9 bases= head= remotes= sep_seen=
12 case ",$sep_seen,$head,$arg," in
20 remotes="$remotes$arg "
28 # Give up if we are given two or more remotes -- not handling octopus.
34 # Give up if this is a baseless merge.
40 git update-index -q --refresh
41 git read-tree -u -m --aggressive $bases $head $remotes || exit 2
42 echo "Trying simple merge."
43 if result_tree=$(git write-tree 2>/dev/null)
47 echo "Simple merge failed, trying Automatic merge."
48 if git merge-index -o git-merge-one-file -a