From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 25 Oct 2013 16:07:27 +0000 (+0100)
Subject: Mention "git merge", not "git-merge", in helpful message. Closes:#725632.
X-Git-Tag: debian/0.17_experimental4~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=85eb1b447f987dc7da3960dd0d078ad6b7d6dd6f;ds=inline

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

diff --git a/debian/changelog b/debian/changelog
index fd85edce..8d87a03c 100644
--- 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 a75a0711..b8922dae 100755
--- 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;".