changeset 23917 | 3cbb5bf4035d |
parent 23862 | 7aa1405528a3 |
child 24378 | 9347c15d8136 |
--- a/tests/test-rebase-conflicts.t Sat Jan 17 18:08:47 2015 -0800 +++ b/tests/test-rebase-conflicts.t Sat Jan 17 22:01:14 2015 -0200 @@ -74,7 +74,7 @@ $ hg rebase --continue already rebased 3:3163e20567cc "L1" as 3e046f2ecedb rebasing 4:46f0b057b5c0 "L2" - abort: unresolved merge conflicts (see hg help resolve) + abort: unresolved merge conflicts (see "hg help resolve") [255] Conclude rebase: