--- a/tests/test-evolve.t Wed Feb 01 15:40:51 2017 +0100
+++ b/tests/test-evolve.t Wed Feb 01 15:45:20 2017 +0100
@@ -56,7 +56,7 @@
between repositories. This allows for a safe and simple way of exchanging
mutable history and altering it after the fact. Changeset phases are
respected, such that only draft and secret changesets can be altered (see
- 'hg help phases' for details).
+ "hg help phases" for details).
Obsolescence is tracked using "obsolete markers", a piece of metadata
tracking which changesets have been made obsolete, potential successors
@@ -602,7 +602,6 @@
$ echo 3 > 1
$ hg resolve -m 1
(no more unresolved files)
- continue: hg graft --continue
$ hg graft --continue -O
grafting 7:a5bfd90a2f29 "conflict" (tip)
$ glog --hidden