diff options
Diffstat (limited to 'git-merge-resolve.sh')
| -rwxr-xr-x | git-merge-resolve.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh index 966e81ff7d..0a8ef216cb 100755 --- a/git-merge-resolve.sh +++ b/git-merge-resolve.sh @@ -38,7 +38,7 @@ then fi git-update-index --refresh 2>/dev/null -git-read-tree -u -m $bases $head $remotes || exit 2 +git-read-tree -u -m --aggressive $bases $head $remotes || exit 2 echo "Trying simple merge." if result_tree=$(git-write-tree 2>/dev/null) then |