Mercurial > hg
comparison mercurial/commands.py @ 44976:3d41172f2ac9 stable
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
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 22 Jun 2020 22:15:57 -0700 |
parents | 2dc5ae953c4a |
children | 93aa152d4295 |
comparison
equal
deleted
inserted
replaced
44975:1a4b9b602e54 | 44976:3d41172f2ac9 |
---|---|
4594 each commit. When the -v/--verbose switch is used, the list of | 4594 each commit. When the -v/--verbose switch is used, the list of |
4595 changed files and full commit message are shown. | 4595 changed files and full commit message are shown. |
4596 | 4596 |
4597 With --graph the revisions are shown as an ASCII art DAG with the most | 4597 With --graph the revisions are shown as an ASCII art DAG with the most |
4598 recent changeset at the top. | 4598 recent changeset at the top. |
4599 'o' is a changeset, '@' is a working directory parent, '_' closes a branch, | 4599 'o' is a changeset, '@' is a working directory parent, '%' is a changeset |
4600 involved in an unresolved merge conflict, '_' closes a branch, | |
4600 'x' is obsolete, '*' is unstable, and '+' represents a fork where the | 4601 'x' is obsolete, '*' is unstable, and '+' represents a fork where the |
4601 changeset from the lines below is a parent of the 'o' merge on the same | 4602 changeset from the lines below is a parent of the 'o' merge on the same |
4602 line. | 4603 line. |
4603 Paths in the DAG are represented with '|', '/' and so forth. ':' in place | 4604 Paths in the DAG are represented with '|', '/' and so forth. ':' in place |
4604 of a '|' indicates one or more revisions in a path are omitted. | 4605 of a '|' indicates one or more revisions in a path are omitted. |