Mercurial > hg-stable

diff tests/test-histedit-non-commute-abort.t @ 28004:34165875fa5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: limit updated and merging output to important updates Output is retained when: * There's a conflict * User asked to edit * User aborts otherwise, output is suppressed
author timeless <timeless@mozdev.org>
date Wed, 03 Feb 2016 13:52:04 +0000
parents e7ff83b2bcfe
children 8abd9f785030
line wrap: on
line diff
--- a/tests/test-histedit-non-commute-abort.t	Thu Feb 04 23:30:49 2016 +0000
+++ b/tests/test-histedit-non-commute-abort.t	Wed Feb 03 13:52:04 2016 +0000
@@ -69,7 +69,6 @@
   > pick e860deea161a e
   > pick 652413bf663e f
   > EOF
-  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   merging e
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change (pick e860deea161a)