diff-patch: Avoid emitting double-slashes in textual patch.

diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index 966e81ff7d353beb15ac2c9ed9a50a1ea45c876c..75e1de49ac9adb443e6065c93ac691c27f0f5518 100755 (executable)
--- a/git-merge-resolve.sh
+++ b/git-merge-resolve.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Linus Torvalds
 # Copyright (c) 2005 Junio C Hamano
 #
-# Resolve two trees, using enhancd multi-base read-tree.
+# Resolve two trees, using enhanced multi-base read-tree.
 
 # The first parameters up to -- are merge bases; the rest are heads.
 bases= head= remotes= sep_seen=
@@ -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