changeset 21266 | 19d6fec60b81 |
parent 20117 | aa9385f983fa |
child 21267 | e4f451c8c05c |
--- a/tests/test-commit-unresolved.t Fri Apr 18 18:56:26 2014 -0700 +++ b/tests/test-commit-unresolved.t Fri Apr 18 22:19:25 2014 -0700 @@ -41,6 +41,7 @@ Mark the conflict as resolved and commit $ hg resolve -m A + no unresolved files; you may continue your unfinished operation $ hg commit -m "Merged" $ cd ..