Mercurial > hg
diff tests/test-backout.t @ 44345:14d0e89520a2
graphlog: use '%' for other context in merge conflict
This lets the user more easily find the commit that is involved in the
conflict, such as the source of `hg update -m` or the commit being
grafted by `hg graft`.
Differential Revision: https://phab.mercurial-scm.org/D8043
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 28 Jan 2020 21:49:50 -0800 |
parents | ab632e27f296 |
children | acbfa31cfaf2 |
line wrap: on
line diff
--- a/tests/test-backout.t Wed Jan 29 14:42:54 2020 -0800 +++ b/tests/test-backout.t Tue Jan 28 21:49:50 2020 -0800 @@ -103,7 +103,7 @@ | date: Thu Jan 01 00:00:02 1970 +0000 | summary: grapes | - o changeset: 1:22cb4f70d813 + % changeset: 1:22cb4f70d813 | user: test | date: Thu Jan 01 00:00:01 1970 +0000 | summary: chair @@ -748,7 +748,7 @@ | date: Thu Jan 01 00:00:00 1970 +0000 | summary: capital three | - o changeset: 0:a30dd8addae3 + % changeset: 0:a30dd8addae3 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: initial