Mercurial > hg-stable

changeset 27458:d39e743e3578

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: mention conflict in documentation instead of merge
author timeless <timeless@mozdev.org>
date Fri, 18 Dec 2015 18:32:15 +0000
parents 97cc045f1cfe
children 2f15253e415f
files hgext/rebase.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/rebase.py	Fri Dec 18 18:31:45 2015 +0000
+++ b/hgext/rebase.py	Fri Dec 18 18:32:15 2015 +0000
@@ -138,7 +138,7 @@
     a named branch with two heads. You will need to explicitly specify source
     and/or destination.
 
-    If a rebase is interrupted to manually resolve a merge, it can be
+    If a rebase is interrupted to manually resolve a conflict, it can be
     continued with --continue/-c or aborted with --abort/-a.
 
     .. container:: verbose