Mercurial > evolve

diff tests/test-stabilize-result.t @ 3741:ec460882eab7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: show cset hash in "merging conetnt-divergent changeset" While I was here I also mae de it repo.ui.status() instead of repo.ui.note() to align the behavior with rest of the messages.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 29 Apr 2018 19:18:54 +0530
parents 07e246deb612
children 1e103c7f7663
line wrap: on
line diff
--- a/tests/test-stabilize-result.t	Sun Apr 29 19:14:41 2018 +0530
+++ b/tests/test-stabilize-result.t	Sun Apr 29 19:18:54 2018 +0530
@@ -290,7 +290,7 @@
   merge:[14] More addition
   with: [13] More addition
   base: [12] More addition
-  merging content-divergent changeset
+  merging "other" content-divergent changeset 'd2f173e25686'
   resolving manifests
   merging a
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
@@ -390,6 +390,7 @@
   merge:[17] More addition (2)
   with: [15] More addition
   base: [12] More addition
+  merging "other" content-divergent changeset 'f344982e63c4'
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -416,6 +417,7 @@
   with: [18] More addition (2)
   base: [16] More addition
   updating to "local" side of the conflict: 0b336205a5d0
+  merging "other" content-divergent changeset 'e015aa78acee'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at e015aa78acee
   $ glog