Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-histedit-non-commute-abort.t
changeset 28004 34165875fa5d
parent 27629 e7ff83b2bcfe
child 28011 8abd9f785030 
--- 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)
mercurial