From 1b1fdf8c2f935e2195d3ca5c37e578bd9146a82f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 3 Feb 2006 22:04:14 -0800 Subject: read-tree --aggressive A new flag --aggressive resolves what we traditionally resolved with external git-merge-one-file inside index while read-tree 3-way merge works. git-merge-octopus and git-merge-resolve use this flag before running git-merge-index with git-merge-one-file. Signed-off-by: Junio C Hamano --- git-merge-octopus.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git-merge-octopus.sh') diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index eb74f96e8..eb3f473d5 100755 --- a/git-merge-octopus.sh +++ b/git-merge-octopus.sh @@ -90,7 +90,7 @@ do NON_FF_MERGE=1 echo "Trying simple merge with $SHA1" - git-read-tree -u -m $common $MRT $SHA1 || exit 2 + git-read-tree -u -m --aggressive $common $MRT $SHA1 || exit 2 next=$(git-write-tree 2>/dev/null) if test $? -ne 0 then -- cgit v1.2.1