--- a/tests/test-stabilize-result.t Fri Feb 08 21:27:48 2013 +0000
+++ b/tests/test-stabilize-result.t Fri Feb 08 21:43:00 2013 +0000
@@ -45,8 +45,8 @@
o 0:07f494440405@default(draft) bk:[] adda
$ hg debugobsolete
- 41ad4fe8c79565a06c89f032ef0937b3cbd68a04 1447e1c4828d2347df8f858aa041305fa4cf7db1 0 {'date': '* *', 'user': 'test'} (glob)
102a90ea7b4a3361e4082ed620918c261189a36a 1447e1c4828d2347df8f858aa041305fa4cf7db1 0 {'date': '* *', 'user': 'test'} (glob)
+ 41ad4fe8c79565a06c89f032ef0937b3cbd68a04 0 {'date': '* *', 'user': 'test'} (glob)
cce2c55b896511e0b6e04173c9450ba822ebc740 0 {'date': '* *', 'user': 'test'} (glob)
Test evolve with conflict