changeset 23917 | 3cbb5bf4035d |
parent 23835 | aa4a1672583e |
child 23929 | a43fdf33a6be |
--- a/tests/test-graft.t Sat Jan 17 18:08:47 2015 -0800 +++ b/tests/test-graft.t Sat Jan 17 22:01:14 2015 -0200 @@ -234,7 +234,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: