Mercurial > evolve

diff tests/test-divergent.t @ 3740:07e246deb612

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: show cset hash in "update to local conflict" message
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 29 Apr 2018 19:14:41 +0530
parents 0bfc4fe3baf8
children ec460882eab7
line wrap: on
line diff
--- a/tests/test-divergent.t	Sun Apr 29 19:11:29 2018 +0530
+++ b/tests/test-divergent.t	Sun Apr 29 19:14:41 2018 +0530
@@ -57,7 +57,7 @@
   merge:[2] add bdivergent1
   with: [3] add bdivergent2
   base: [1] add _b
-  updating to "local" conflict
+  updating to "local" side of the conflict: c2f698071cba
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at c26f1d3baed2
   $ hg log -G
@@ -101,7 +101,7 @@
   merge:[6] add cdivergent1
   with: [7] cdivergent2
   base: [5] add _c
-  updating to "local" conflict
+  updating to "local" side of the conflict: 26c7705fee96
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   nothing changed
   working directory is now at 26c7705fee96