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