Mention "git merge", not "git-merge", in helpful message. Closes:#725632.

diff --git a/debian/changelog b/debian/changelog
index fd85edce8cfe075f0efc7798824c063606b12c0e..8d87a03ca0ed16631344555b19dfb7142c74d331 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ dgit (0.17~experimental4) experimental; urgency=low
     not to have caused any real trouble in previous versions of dgit.
   * Retrospectively mention in changelog entry for 0.16~experimental2
     that it Closes:#727125.
+  * Mention "git merge", not "git-merge", in helpful message.
+    Closes:#725632.
 
  --
 

diff --git a/dgit b/dgit
index a75a0711a2dcb48a0a3ac8a7f8f4468e1ea0b86b..b8922dae0c76c9970446eb59fa4ea98deaf01420 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1459,7 +1459,7 @@ sub cmd_push {
        is_fast_fwd(lrref(), 'HEAD') or
            fail "dgit push: HEAD is not a descendant".
                " of the archive's version.\n".
-               "$us: To overwrite it, use git-merge -s ours ".lrref().".";
+               "$us: To overwrite it, use git merge -s ours ".lrref().".";
     } else {
        $new_package or
            fail "package appears to be new in this suite;".