X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=git-resolve-script;h=da79a973eaafa1b8b7e21b719698762896e13569;hb=5d6ccf5ce7f28e576a87f6c6f4f99fae90e06db6;hp=cd6e25a8a2bfca43f4b4b01cfda4378203b2b09c;hpb=e5b905c4481a3364070094b8ce0c2bf7fa5d481e;p=git.git

diff --git a/git-resolve-script b/git-resolve-script
index cd6e25a8..da79a973 100644
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -43,7 +43,7 @@ if [ "$common" == "$head" ]; then
 fi
 echo "Trying to merge $merge into $head"
 git-read-tree -u -m $common $head $merge || exit 1
-merge_msg="Merge of $merge_repo"
+merge_msg="Merge $merge_repo"
 result_tree=$(git-write-tree  2> /dev/null)
 if [ $? -ne 0 ]; then
 	echo "Simple merge failed, trying Automatic merge"
@@ -52,7 +52,6 @@ if [ $? -ne 0 ]; then
 		echo "Automatic merge failed, fix up by hand"
 		exit 1
 	fi
-	merge_msg="Automatic merge of $merge_repo"
 	result_tree=$(git-write-tree) || exit 1
 fi
 result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)