--- a/tests/test-stabilize-result.t Wed Aug 20 21:14:49 2014 -0700
+++ b/tests/test-stabilize-result.t Wed Aug 20 20:49:48 2014 -0700
@@ -48,8 +48,8 @@
$ hg debugobsolete
102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'user': 'test'} (glob)
- c5727dbded3c3a6877cf60d6bb552a76812cb844 0 (*) {'p1': '102a90ea7b4a3361e4082ed620918c261189a36a', 'user': 'test'} (glob)
- cce2c55b896511e0b6e04173c9450ba822ebc740 0 (*) {'p1': '102a90ea7b4a3361e4082ed620918c261189a36a', 'user': 'test'} (glob)
+ c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'user': 'test'} (glob)
+ cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'user': 'test'} (glob)
Test evolve with conflict