# HG changeset patch # User Pierre-Yves David # Date 1406679301 25200 # Node ID 574315ec19c2ab68293761ecfe33385d8f58116c # Parent 195642c1520bc80bc7daec9623e7d3b6d7ce036d test: adapt to upstream message change A message gained parenthesis in 3.1 we reflect than in the test. diff -r 195642c1520b -r 574315ec19c2 tests/test-evolve.t --- a/tests/test-evolve.t Thu Jul 24 12:02:53 2014 -0700 +++ b/tests/test-evolve.t Tue Jul 29 17:15:01 2014 -0700 @@ -539,7 +539,7 @@ 7:a5bfd90a2f29 stable $ echo 3 > 1 $ hg resolve -m 1 - no more unresolved files + (no more unresolved files) $ hg graft --continue -O grafting revision 7 $ glog --hidden diff -r 195642c1520b -r 574315ec19c2 tests/test-stabilize-conflict.t --- a/tests/test-stabilize-conflict.t Thu Jul 24 12:02:53 2014 -0700 +++ b/tests/test-stabilize-conflict.t Tue Jul 29 17:15:01 2014 -0700 @@ -164,7 +164,7 @@ reverting babar $ safesed 's/dix/ten/' babar $ hg resolve --all -m - no more unresolved files + (no more unresolved files) $ hg evolve --continue grafting revision 5 $ hg resolve -l diff -r 195642c1520b -r 574315ec19c2 tests/test-stabilize-result.t --- 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