Merge branch 'jc/pull-rebase-ff'

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 308eafd1d38422ce5e9d4c8d90050a28795479f9..bcf0d92ec223bf9e1f0995c5acef6376d1299502 100755 (executable)
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -30,7 +30,7 @@ do
        esac
 done
 
-# Reject if this is not an Octopus -- resolve should be used instead.
+# Reject if this is not an octopus -- resolve should be used instead.
 case "$remotes" in
 ?*' '?*)
        ;;
@@ -59,7 +59,7 @@ do
                # conflicts.  Last round failed and we still had
                # a head to merge.
                gettextln "Automated merge did not work."
-               gettextln "Should not be doing an Octopus."
+               gettextln "Should not be doing an octopus."
                exit 2
        esac