Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/commands.py
changeset 44997 93aa152d4295
parent 44916 61719b9658b1
parent 44976 3d41172f2ac9
child 45008 e1ea913da2ed 
--- a/mercurial/commands.py	Fri Jun 05 01:54:13 2020 +0200
+++ b/mercurial/commands.py	Thu Jun 25 22:40:04 2020 +0900
@@ -4613,7 +4613,8 @@
 
     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, '_' closes a branch,
+    'o' is a changeset, '@' is a working directory parent, '%' is a changeset
+    involved in an unresolved merge conflict, '_' 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.
mercurial