Mercurial > evolve
diff tests/test-stabilize-conflict.t @ 3995:684cc3418ecd mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 21 Aug 2018 13:26:35 +0200 |
| parents | d00f0c369bc7 fb8e44c70798 |
| children | 21eab0a99841 |
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t Fri Aug 03 00:19:47 2018 +0200 +++ b/tests/test-stabilize-conflict.t Tue Aug 21 13:26:35 2018 +0200 @@ -140,7 +140,7 @@ | date: Thu Jan 01 00:00:00 1970 +0000 | summary: babar count up to ten | - | o changeset: 4:71c18f70c34f + | @ changeset: 4:71c18f70c34f | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | instability: orphan @@ -232,7 +232,7 @@ | date: Thu Jan 01 00:00:00 1970 +0000 | summary: babar count up to ten | - | o changeset: 6:1836b91c6c1d + | @ changeset: 6:1836b91c6c1d | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | instability: orphan