checkout: use --aggressive when running a 3-way merge (-m).

[git.git] / git-checkout.sh

diff --git a/git-checkout.sh b/git-checkout.sh
index 463ed2e..a11c939 100755 (executable)
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -144,7 +144,7 @@ else
        work=`git write-tree` &&
        git read-tree --reset $new &&
        git checkout-index -f -u -q -a &&
-       git read-tree -m -u $old $new $work || exit
+       git read-tree -m -u --aggressive $old $new $work || exit
 
        if result=`git write-tree 2>/dev/null`
        then