--- a/tests/test-topic-mode.t	Fri Oct 20 15:13:28 2017 +0200
+++ b/tests/test-topic-mode.t	Fri Oct 20 23:03:11 2017 +0200
@@ -50,15 +50,32 @@
   > EOF
   $ touch a b c d
   $ hg add a
-  $ hg ci -m "Added a"
-  warning: new draft commit without topic
-  (see 'hg help -e topic.topic-mode' for details) (no-eol)
 
 (same test, checking we abort before the editor)
 
-  $ EDITOR=cat hg ci --amend -m "Added a" --edit
+  $ HGEDITOR=cat hg ci -m "Added a" --edit
   warning: new draft commit without topic
-  (see 'hg help -e topic.topic-mode' for details) (no-eol)
+  (see 'hg help -e topic.topic-mode' for details)
+  Added a
+  
+  
+  HG: Enter commit message.  Lines beginning with 'HG:' are removed.
+  HG: Leave message empty to abort commit.
+  HG: --
+  HG: user: test
+  HG: branch 'default'
+  HG: added a
+
+  $ HGEDITOR=cat hg ci --amend -m "Added a" --edit
+  Added a
+  
+  
+  HG: Enter commit message.  Lines beginning with 'HG:' are removed.
+  HG: Leave message empty to abort commit.
+  HG: --
+  HG: user: test
+  HG: branch 'default'
+  HG: added a
   $ hg ci --amend -m "added a'" --config experimental.topic-mode=ignore
   $ hg log
   changeset:   2:2e862d8b5eff
@@ -103,7 +120,7 @@
   (branch merge, don't forget to commit)
   $ hg commit -m "merge mytopic"
   warning: new draft commit without topic
-  (see 'hg help -e topic.topic-mode' for details) (no-eol)
+  (see 'hg help -e topic.topic-mode' for details)
 
   $ hg log -G
   @    changeset:   3:676a445d1c09