# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450463535 0
# Node ID d39e743e357878813c2aaa999a5b14c50864a2e6
# Parent  97cc045f1cfe05e80382050f0827195a9cab6e04
rebase: mention conflict in documentation instead of merge

diff -r 97cc045f1cfe -r d39e743e3578 hgext/rebase.py
--- 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