Patchwork D8649: help: document meaning of '%' in graphlog output

login
register
mail settings
Submitter phabricator
Date June 23, 2020, 5:22 a.m.
Message ID <differential-rev-PHID-DREV-wbfqb5hamqtzxccztjmb-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/46548/
State Superseded
Headers show

Comments

phabricator - June 23, 2020, 5:22 a.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  I added the feature in 14d0e89520a2 <https://phab.mercurial-scm.org/rHG14d0e89520a265e909711d8d184e1efa8791f140> (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).

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8649

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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.