Mercurial > hg-stable
changeset 44820: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 | 1a4b9b602e54 |
| children | afcad425a0b6 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Jun 17 16:11:11 2020 -0700 +++ b/mercurial/commands.py Mon Jun 22 22:15:57 2020 -0700 @@ -4596,7 +4596,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.