changeset 23917 | 3cbb5bf4035d |
parent 21947 | b081decd9062 |
child 26614 | ef1eb6df7071 |
--- a/tests/test-commit-unresolved.t Sat Jan 17 18:08:47 2015 -0800 +++ b/tests/test-commit-unresolved.t Sat Jan 17 22:01:14 2015 -0200 @@ -35,7 +35,7 @@ $ echo "ABCD" > A $ hg commit -m "Merged" - abort: unresolved merge conflicts (see hg help resolve) + abort: unresolved merge conflicts (see "hg help resolve") [255] Mark the conflict as resolved and commit