Mercurial > evolve
diff tests/test-stabilize-conflict.t @ 3411:e1f3e43a50a4 stable
branching: backed out test output changes from core-1905aac253f0
This backs out evolve-ae6fddf39933
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 15 Jan 2018 19:52:00 +0100 |
| parents | 823031b51d81 |
| children | d3a17c67f85c 85cdce113c2c |
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t Mon Jan 15 19:42:44 2018 +0100 +++ b/tests/test-stabilize-conflict.t Mon Jan 15 19:52:00 2018 +0100 @@ -142,7 +142,7 @@ | date: Thu Jan 01 00:00:00 1970 +0000 | summary: babar count up to ten | - | * changeset: 4:71c18f70c34f + | o changeset: 4:71c18f70c34f | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | instability: orphan @@ -234,7 +234,7 @@ | date: Thu Jan 01 00:00:00 1970 +0000 | summary: babar count up to ten | - | * changeset: 6:1836b91c6c1d + | o changeset: 6:1836b91c6c1d | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | instability: orphan