Mercurial > hg-stable

changeset 15210:9d8115c5fbda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout: add a note about not working on merges
author Matt Mackall <mpm@selenic.com>
date Sat, 08 Oct 2011 13:28:13 -0500
parents 10f85a735601
children 1209de02034e
files mercurial/commands.py
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Sat Oct 08 13:23:57 2011 -0500
+++ b/mercurial/commands.py	Sat Oct 08 13:28:13 2011 -0500
@@ -378,6 +378,10 @@
     is committed automatically. Otherwise, hg needs to merge the
     changes and the merged result is left uncommitted.
 
+    .. note::
+      backout cannot be used to fix either an unwanted or
+      incorrect merge.
+
     .. container:: verbose
 
       By default, the pending changeset will have one parent,