Patchwork [5,of,5] rebase: mention conflict in documentation instead of merge

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 18, 2015, 6:59 p.m.
Message ID <bfd2df56b16b80d5d4e4.1450465166@waste.org>
Download mbox | patch
Permalink /patch/12163/
State Accepted
Headers show

Comments

timeless@mozdev.org - Dec. 18, 2015, 6:59 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450463535 0
#      Fri Dec 18 18:32:15 2015 +0000
# Node ID bfd2df56b16b80d5d4e4d8887221d0495c925319
# Parent  c3b75502cea61864a9a4f7b9d916443430de09ab
rebase: mention conflict in documentation instead of merge
Matt Mackall - Dec. 20, 2015, 11:41 p.m.
On Fri, 2015-12-18 at 12:59 -0600, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1450463535 0
> #      Fri Dec 18 18:32:15 2015 +0000
> # Node ID bfd2df56b16b80d5d4e4d8887221d0495c925319
> # Parent  c3b75502cea61864a9a4f7b9d916443430de09ab
> rebase: mention conflict in documentation instead of merge

These are queued for default, thanks.

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -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