Commit 2dc60152 authored by Matt Mackall's avatar Matt Mackall
Browse files

backout: add a note about not working on merges

parent 10f85a735601
......@@ -378,6 +378,10 @@ def backout(ui, repo, node=None, rev=None, **opts):
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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment