Mercurial > evolve

diff tests/test-evolve.t @ 2799:1627153804dc mercurial-4.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge with mercurial-4.2
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 25 Jul 2017 03:59:22 +0200
parents 06ee4ec88190 54ac473663ff
children 49494d0155b7 00e4d31b8cdb
line wrap: on
line diff
--- a/tests/test-evolve.t	Tue Jul 25 03:41:15 2017 +0200
+++ b/tests/test-evolve.t	Tue Jul 25 03:59:22 2017 +0200
@@ -92,8 +92,9 @@
       Orphans are changesets left behind when their ancestors are rewritten,
       (currently: 'unstable'). Divergence has two variants:
   
-      * Content-divergence occurs when independent rewrites of the same
-        changesets lead to different results. (currently: 'divergent')
+      * Content-divergence occurs when independent rewrites of the same changesets
+        lead to different results. (currently: 'divergent')
+  
       * Phase-divergence occurs when the old (obsolete) version of a changeset
         becomes public. (currently: 'bumped')