diff mercurial/commands.py @ 36398:eb73f8a6177e

merge with stable
author Kevin Bullock <kbullock+mercurial@ringworld.org>
date Sat, 24 Feb 2018 17:49:10 -0600
parents 920bbfb686da eedc69d2776d
children a75cab94e936
line wrap: on
line diff
--- a/mercurial/commands.py	Sat Feb 24 16:20:55 2018 +0530
+++ b/mercurial/commands.py	Sat Feb 24 17:49:10 2018 -0600
@@ -3304,9 +3304,10 @@
 
     With --graph the revisions are shown as an ASCII art DAG with the most
     recent changeset at the top.
-    'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
-    and '+' represents a fork where the changeset from the lines below is a
-    parent of the 'o' merge on the same line.
+    'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
+    'x' is obsolete, '*' is unstable, and '+' represents a fork where the
+    changeset from the lines below is a parent of the 'o' merge on the same
+    line.
     Paths in the DAG are represented with '|', '/' and so forth. ':' in place
     of a '|' indicates one or more revisions in a path are omitted.