summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2013-10-25 17:07:27 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2013-10-25 17:07:27 +0100
commit85eb1b447f987dc7da3960dd0d078ad6b7d6dd6f (patch)
tree60c00505ad6e0d24b0188c23bc0dfad364fe173e /dgit
parent2858ecef5bad752f86bfeb101370aea0b15834ac (diff)
Mention "git merge", not "git-merge", in helpful message. Closes:#725632.
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit2
1 files changed, 1 insertions, 1 deletions
diff --git a/dgit b/dgit
index a75a071..b8922da 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;".