Mercurial Mercurial > pub > hg > evolve / 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-stabilize-result.t
changeset 3739 0bfc4fe3baf8
parent 3738 ed3f69fb67bf
child 3740 07e246deb612 
--- a/tests/test-stabilize-result.t	Sun Apr 29 19:04:18 2018 +0530
+++ b/tests/test-stabilize-result.t	Sun Apr 29 19:11:29 2018 +0530
@@ -417,7 +417,6 @@
   base: [16] More addition
   updating to "local" conflict
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at e015aa78acee
   $ glog
   @  18:e015aa78acee@default(draft) bk:[] More addition (2)
evolve