Mercurial > evolve

diff tests/test-evolve-content-divergent-meta.t @ 4633:61c2518cd6d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: move status msg to verbose mode in content-divergence resolution As suggested by Pierre-Yves, lets move these too verbose message for the user to verbose mode to decrease some noise.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Fri, 26 Apr 2019 01:20:08 +0530
parents a4fde4e3e763
children ea9ae2d2095a
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-meta.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-content-divergent-meta.t	Fri Apr 26 01:20:08 2019 +0530
@@ -86,8 +86,6 @@
   merge:[3] added c e
   with: [4] added c
   base: [2] added c
-  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
 
 Make sure resultant cset don't replace the initial user with user running the command: