Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 44997:93aa152d4295

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Yuya Nishihara <yuya@tcha.org>
date Thu, 25 Jun 2020 22:40:04 +0900
parents 61719b9658b1 3d41172f2ac9
children e1ea913da2ed
line wrap: on
line diff
--- 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.