Mercurial > evolve

diff tests/test-obsolete.t @ 3004:a456f55b3a6b mercurial-3.9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compat-test: merge future 6.7.0 into 3.9 compat branch (merging through 4.0 compat branch)
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 27 Sep 2017 01:22:58 +0200
parents 49494d0155b7 ddf28837f5af
children f66227d76402 706402d70b3f
line wrap: on
line diff
--- a/tests/test-obsolete.t	Tue Jul 25 15:18:09 2017 +0200
+++ b/tests/test-obsolete.t	Wed Sep 27 01:22:58 2017 +0200
@@ -694,7 +694,7 @@
   $ hg up --hidden 2
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete! (4538525df7e2)
-  (4538525df7e2 has diverged, use 'hg evolve --list --divergent' to resolve the issue)
+  (4538525df7e2 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
   $ hg export 9468a5f5d8b2 | hg import -
   applying patch from stdin
   1 new unstable changesets