Mercurial > evolve

diff tests/test-evolve-stop.t @ 3592:7a5c3175015e mercurial-4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.3 into mercurial-4.2
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 21 Mar 2018 16:32:54 +0100
parents 98941c28f3e2
children
line wrap: on
line diff
--- a/tests/test-evolve-stop.t	Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-evolve-stop.t	Wed Mar 21 16:32:54 2018 +0100
@@ -144,7 +144,7 @@
   $ hg diff
   diff -r cb6a2ab625bb d
   --- a/d	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/d	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/d	* (glob)
   @@ -1,1 +1,5 @@
   +<<<<<<< destination: cb6a2ab625bb - test: added c
    bar