branch | stable |
changeset 21947 | b081decd9062 |
parent 21267 | e4f451c8c05c |
child 23917 | 3cbb5bf4035d |
--- a/tests/test-commit-unresolved.t Fri Jul 25 15:51:42 2014 -0500 +++ b/tests/test-commit-unresolved.t Sat Jul 26 03:32:49 2014 +0200 @@ -41,7 +41,7 @@ Mark the conflict as resolved and commit $ hg resolve -m A - no more unresolved files + (no more unresolved files) $ hg commit -m "Merged" $ cd ..