--- a/tests/test-commit-unresolved.t Tue Sep 20 23:47:46 2016 +0000
+++ b/tests/test-commit-unresolved.t Tue Sep 20 23:48:08 2016 +0000
@@ -34,7 +34,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
@@ -56,7 +56,7 @@
[1]
$ hg rm --force A
$ hg commit -m merged
- abort: unresolved merge conflicts (see "hg help resolve")
+ abort: unresolved merge conflicts (see 'hg help resolve')
[255]
$ hg resolve -ma