Mercurial > evolve

diff tests/test-sharing.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 2e703ed1c713
children 88601e1cd5d8
line wrap: on
line diff
--- a/tests/test-sharing.t	Sun Apr 29 19:14:41 2018 +0530
+++ b/tests/test-sharing.t	Sun Apr 29 19:18:54 2018 +0530
@@ -509,6 +509,7 @@
   merge:[5] fix bug 24 (v2 by bob)
   with: [6] fix bug 24 (v2 by alice)
   base: [4] fix bug 24 (v1)
+  merging "other" content-divergent changeset 'e3f99ce9d9cd'
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   working directory is now at 5ad6037c046c
   $ hg log -q -r 'contentdivergent()'