Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 44344:ab632e27f296 | 44345:14d0e89520a2 |
|---|---|
| 101 o changeset: 2:a8c6e511cfee | 101 o changeset: 2:a8c6e511cfee |
| 102 | user: test | 102 | user: test |
| 103 | date: Thu Jan 01 00:00:02 1970 +0000 | 103 | date: Thu Jan 01 00:00:02 1970 +0000 |
| 104 | summary: grapes | 104 | summary: grapes |
| 105 | | 105 | |
| 106 o changeset: 1:22cb4f70d813 | 106 % changeset: 1:22cb4f70d813 |
| 107 | user: test | 107 | user: test |
| 108 | date: Thu Jan 01 00:00:01 1970 +0000 | 108 | date: Thu Jan 01 00:00:01 1970 +0000 |
| 109 | summary: chair | 109 | summary: chair |
| 110 | | 110 | |
| 111 o changeset: 0:a5cb2dde5805 | 111 o changeset: 0:a5cb2dde5805 |
| 746 o changeset: 1:913609522437 | 746 o changeset: 1:913609522437 |
| 747 | user: test | 747 | user: test |
| 748 | date: Thu Jan 01 00:00:00 1970 +0000 | 748 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 749 | summary: capital three | 749 | summary: capital three |
| 750 | | 750 | |
| 751 o changeset: 0:a30dd8addae3 | 751 % changeset: 0:a30dd8addae3 |
| 752 user: test | 752 user: test |
| 753 date: Thu Jan 01 00:00:00 1970 +0000 | 753 date: Thu Jan 01 00:00:00 1970 +0000 |
| 754 summary: initial | 754 summary: initial |
| 755 | 755 |
| 756 $ hg resolve --all --debug | 756 $ hg resolve --all --debug |