changeset 3394 | d1486760fb8d |
parent 3388 | be41e4740a25 |
child 3395 | 02192ac8ef98 |
--- a/tests/test-evolve-phase.t Wed Jan 10 15:59:35 2018 +0530 +++ b/tests/test-evolve-phase.t Thu Jan 11 18:38:09 2018 +0530 @@ -91,6 +91,17 @@ abort: unresolved merge conflicts (see hg help resolve) [255] + $ 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 + @@ -1,1 +1,5 @@ + +<<<<<<< local: 87495ea7c9ec - test: b + b2 + +======= + +c + +>>>>>>> graft: 13833940840c - test: c + $ hg glog @ 3 - 87495ea7c9ec b (draft) |