changeset 29975 | c15f06109b7a |
parent 28963 | fc1d75e7a98d |
child 30188 | 8a864844d5a0 |
--- a/tests/test-graft.t Tue Sep 20 23:47:46 2016 +0000 +++ b/tests/test-graft.t Tue Sep 20 23:48:08 2016 +0000 @@ -253,7 +253,7 @@ $ hg graft -c grafting 4:9c233e8e184d "4" - abort: unresolved merge conflicts (see "hg help resolve") + abort: unresolved merge conflicts (see 'hg help resolve') [255] Fix up: