Commit e6f14b5e authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

help: document meaning of '%' in graphlog output

I added the feature in 14d0e89520a2 (graphlog: use '%' for other
context in merge conflict, 2020-01-28), but I didn't think to look for
documentation until today (because an internal user asked about it).

Differential Revision: https://phab.mercurial-scm.org/D8649

--HG--
branch : stable
parent 1a4b9b602e54
Pipeline #7277 canceled with stage
in 22 seconds
...@@ -4596,7 +4596,8 @@ def log(ui, repo, *pats, **opts): ...@@ -4596,7 +4596,8 @@ def log(ui, repo, *pats, **opts):
With --graph the revisions are shown as an ASCII art DAG with the most With --graph the revisions are shown as an ASCII art DAG with the most
recent changeset at the top. 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 '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 changeset from the lines below is a parent of the 'o' merge on the same
line. 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