X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-octopus.sh;h=825c52c2436d15edb12a2ce7850437e0e531e0e3;hb=1c6f5b52b7b13bbc6cf404cb5ef9e64fda37655c;hp=1dadbb49666c6d796df76babbfd291a2de4357e4;hpb=2beba6beb0074afac988594539572865fb37a00f;p=git.git

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 1dadbb496..825c52c24 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -81,7 +81,7 @@ do
 		# tree as the intermediate result of the merge.
 		# We still need to count this as part of the parent set.
 
-		echo "Fast forwarding to: $SHA1"
+		echo "Fast-forwarding to: $SHA1"
 		git read-tree -u -m $head $SHA1 || exit
 		MRC=$SHA1 MRT=$(git write-tree)
 		continue