diff -r de43a3e6b358 -r edcd2f0474c8 tests/test-stabilize-conflict.t --- a/tests/test-stabilize-conflict.t Fri Jan 22 21:41:59 2016 +0900 +++ b/tests/test-stabilize-conflict.t Wed Feb 03 23:21:50 2016 +0000 @@ -169,7 +169,7 @@ grafting 5:71c18f70c34f "babar count up to fifteen" $ hg resolve -l $ hg log -G - @ changeset: 8:7f3d9db50b5d + @ changeset: 8:1836b91c6c1d | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 @@ -232,7 +232,7 @@ | date: Thu Jan 01 00:00:00 1970 +0000 | summary: babar count up to ten | - | o changeset: 8:7f3d9db50b5d + | o changeset: 8:1836b91c6c1d | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | summary: babar count up to fifteen