--- a/tests/test-topic.t Wed Mar 30 23:55:31 2016 -0700
+++ b/tests/test-topic.t Wed Mar 30 23:58:30 2016 -0700
@@ -91,7 +91,6 @@
narf
$ echo 'narf!!!' >> alpha
$ hg ci -m 'narf!'
- created new head
$ hg log -G
@ changeset: 6:7c34953036d6
| tag: tip
@@ -293,7 +292,6 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo answer >> alpha
$ hg ci -m 'Narf is like `zort` or `poit`!'
- created new head
$ hg merge narf
merging alpha
warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark')
@@ -305,7 +303,6 @@
(no more unresolved files)
$ hg topic narf
$ hg ci -m 'Finish narf'
- created new head
$ hg topics
fran
* narf