diff -r 54e5c239c2d9 -r a8e6897dffbe tests/test-histedit-non-commute-abort.t
--- a/tests/test-histedit-non-commute-abort.t	Mon Apr 06 16:07:18 2015 -0700
+++ b/tests/test-histedit-non-commute-abort.t	Sun Apr 05 11:55:38 2015 -0700
@@ -70,8 +70,6 @@
   > pick 652413bf663e f
   > EOF
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  remote changed e which local deleted
-  use (c)hanged version or leave (d)eleted? c
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
   warning: conflicts during merge.