diff options
Diffstat (limited to 'git-merge-resolve.sh')
| -rwxr-xr-x | git-merge-resolve.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh index 75e1de49ac..c9da747fcf 100755 --- a/git-merge-resolve.sh +++ b/git-merge-resolve.sh @@ -25,7 +25,7 @@ do esac done -# Give up if we are given more than two remotes -- not handling octopus. +# Give up if we are given two or more remotes -- not handling octopus. case "$remotes" in ?*' '?*) exit 2 ;; @@ -37,10 +37,10 @@ then exit 2 fi -git-update-index --refresh 2>/dev/null -git-read-tree -u -m --aggressive $bases $head $remotes || exit 2 +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) +if result_tree=$(git write-tree 2>/dev/null) then exit 0 else |