diff -r 868e2cea3ea0 -r b081decd9062 tests/test-add.t --- a/tests/test-add.t Fri Jul 25 15:51:42 2014 -0500 +++ b/tests/test-add.t Sat Jul 26 03:32:49 2014 +0200 @@ -107,7 +107,7 @@ M a ? a.orig $ hg resolve -m a - no more unresolved files + (no more unresolved files) $ hg ci -m merge Issue683: peculiarity with hg revert of an removed then added file