changeset 13542 | 6e3bf361f70c |
parent 13541 | 919174c0aaff |
child 15501 | 2371f4aea665 |
--- a/tests/test-commit-unresolved.t Sun Mar 06 14:38:47 2011 +0100 +++ b/tests/test-commit-unresolved.t Sun Mar 06 15:30:39 2011 +0100 @@ -38,7 +38,7 @@ $ echo "ABCD" > A $ hg commit -m "Merged" - abort: unresolved merge conflicts (see hg resolve) + abort: unresolved merge conflicts (see hg help resolve) [255] Mark the conflict as resolved and commit