diff -r 657a38cd2ae3 -r 640f3280559e tests/test-exchange-A3.t --- a/tests/test-exchange-A3.t Fri Aug 08 17:46:20 2014 -0700 +++ b/tests/test-exchange-A3.t Fri Aug 08 17:49:22 2014 -0700 @@ -112,7 +112,7 @@ added 1 changesets with 1 changes to 1 files OBSEXC: pull obsolescence markers OBSEXC: merging obsolescence markers (62 bytes) - OBSEXC: 1 markers added + OBSEXC: 1 obsolescence markers added OBSEXC: DONE (run 'hg update' to get a working copy) ## post pull state @@ -216,7 +216,7 @@ added 1 changesets with 1 changes to 2 files (+1 heads) OBSEXC: pull obsolescence markers OBSEXC: merging obsolescence markers (62 bytes) - OBSEXC: 1 markers added + OBSEXC: 1 obsolescence markers added OBSEXC: DONE (run 'hg heads' to see heads, 'hg merge' to merge) 1 new unstable changesets