comparison mercurial/commands.py @ 44997:93aa152d4295

merge with stable
author Yuya Nishihara <yuya@tcha.org>
date Thu, 25 Jun 2020 22:40:04 +0900
parents 61719b9658b1 3d41172f2ac9
children e1ea913da2ed
comparison
equal deleted inserted replaced
44996:c2df0bca0dfa 44997:93aa152d4295
4611 each commit. When the -v/--verbose switch is used, the list of 4611 each commit. When the -v/--verbose switch is used, the list of
4612 changed files and full commit message are shown. 4612 changed files and full commit message are shown.
4613 4613
4614 With --graph the revisions are shown as an ASCII art DAG with the most 4614 With --graph the revisions are shown as an ASCII art DAG with the most
4615 recent changeset at the top. 4615 recent changeset at the top.
4616 'o' is a changeset, '@' is a working directory parent, '_' closes a branch, 4616 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4617 involved in an unresolved merge conflict, '_' closes a branch,
4617 'x' is obsolete, '*' is unstable, and '+' represents a fork where the 4618 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4618 changeset from the lines below is a parent of the 'o' merge on the same 4619 changeset from the lines below is a parent of the 'o' merge on the same
4619 line. 4620 line.
4620 Paths in the DAG are represented with '|', '/' and so forth. ':' in place 4621 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4621 of a '|' indicates one or more revisions in a path are omitted. 4622 of a '|' indicates one or more revisions in a path are omitted.