Mercurial > evolve

diff tests/test-sharing.t @ 3154:406992d0d611

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: rename --contentdivergent flag to --content-divergent This makes the whole things easier to read.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 26 Oct 2017 09:02:25 +0200
parents 8feb2cae7eae
children e1a230cc4527 ae6fddf39933
line wrap: on
line diff
--- a/tests/test-sharing.t	Thu Oct 26 08:44:50 2017 +0200
+++ b/tests/test-sharing.t	Thu Oct 26 09:02:25 2017 +0200
@@ -505,7 +505,7 @@
   6:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
 
 Use evolve to fix the divergence.
-  $ HGMERGE=internal:other hg evolve --contentdivergent
+  $ HGMERGE=internal:other hg evolve --content-divergent
   merge:[5] fix bug 24 (v2 by bob)
   with: [6] fix bug 24 (v2 by alice)
   base: [4] fix bug 24 (v1)