changeset 1003 | 574315ec19c2 |
parent 984 | b286f77d680c |
child 1032 | 0fcddde7dae6 |
--- a/tests/test-stabilize-result.t Thu Jul 24 12:02:53 2014 -0700 +++ b/tests/test-stabilize-result.t Tue Jul 29 17:15:01 2014 -0700 @@ -95,7 +95,7 @@ abort: unresolved merge conflicts (see hg help resolve) [255] $ hg resolve -m a - no more unresolved files + (no more unresolved files) $ hg evolve --continue grafting revision 5