Read about our upcoming Code of Conduct on this issue

Commit 62db44be authored by Anton Shestakov's avatar Anton Shestakov
Browse files

docs: update evolve-faq.rst with new prune flag and proper vocabulary

Also strip trailing newlines.

--HG--
branch : stable
parent 184c64c81528
......@@ -157,11 +157,11 @@ You can also use evolve to solve `phase-divergent` and `content-divergent` chang
Fix my history afterward: ``prune -n``
--------------------------------------
Sometimes you need to create an obsolete marker by hand. This may happen when
upstream has applied some of your patches for example.
Sometimes you need to create an obsolescence marker by hand. This may happen
when upstream has applied some of your patches for example.
you can use ``hg prune <old-changeset> --succ <new-changeset>`` to add obsolete
marker.
You can use ``hg prune <old-changeset> --successor <new-changeset>`` to add
obsolescence marker.
View diff from the last amend
-----------------------------
......@@ -172,8 +172,8 @@ An ``odiff`` alias have been added by ``enable.sh``
[alias]
odiff = diff --rev 'limit(predecessors(.),1)' --rev .
View obsolete markers
---------------------
View obsolescence markers
-------------------------
hgview_ is the only viewer that currently supports this feature. You
need version 1.6.2
......@@ -204,12 +204,3 @@ Only ``hg log`` and ``hgview`` support it, other
graphical viewer do not.
You can use ``hg log --graph --hidden`` from the command line
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