Mercurial > evolve

diff tests/test-evolve-content-divergent-meta.t @ 4577:bcd52ce0916d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: don't update after instability resolution by default (BC)
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 24 Apr 2019 15:59:02 +0200
parents 02d3177085e1
children a4fde4e3e763
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-meta.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-content-divergent-meta.t	Wed Apr 24 15:59:02 2019 +0200
@@ -89,7 +89,6 @@
   updating to "local" side of the conflict: 0c9267e23c9d
   merging "other" content-divergent changeset '6c06cda6dc99'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 443bd2972210
 
 Make sure resultant cset don't replace the initial user with user running the command:
   $ hg log -r tip