projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix memory leak in "git rev-list --objects"
[git.git]
/
git-merge-resolve.sh
diff --git
a/git-merge-resolve.sh
b/git-merge-resolve.sh
index
966e81f
..
0a8ef21
100755
(executable)
--- 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