branch | mercurial-4.2 |
changeset 3592 | 7a5c3175015e |
parent 3591 | 98941c28f3e2 |
parent 3419 | 1e2f683e11e7 |
--- a/tests/test-evolve-phase.t Wed Mar 21 16:18:31 2018 +0100 +++ b/tests/test-evolve-phase.t Wed Mar 21 16:32:54 2018 +0100 @@ -94,7 +94,7 @@ $ hg diff diff -r 87495ea7c9ec a --- a/a Thu Jan 01 00:00:00 1970 +0000 - +++ b/a Thu Jan 01 00:00:00 1970 +0000 + +++ b/a * (glob) @@ -1,1 +1,5 @@ +<<<<<<< destination: 87495ea7c9ec - test: b b2