branch | stable |
changeset 21947 | b081decd9062 |
parent 21267 | e4f451c8c05c |
child 22046 | 7a9cbb315d84 |
--- a/tests/test-convert-svn-sink.t Fri Jul 25 15:51:42 2014 -0500 +++ b/tests/test-convert-svn-sink.t Sat Jul 26 03:32:49 2014 +0200 @@ -352,7 +352,7 @@ [1] $ hg --cwd b revert -r 2 b $ hg --cwd b resolve -m b - no more unresolved files + (no more unresolved files) $ hg --cwd b ci -d '5 0' -m 'merge' Expect 4 changes