Mercurial > evolve

comparison tests/test-evolve-phase.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 1e2f683e11e7
children
comparison
equal deleted inserted replaced
3591:98941c28f3e2 3592:7a5c3175015e
92 [255] 92 [255]
93 93
94 $ hg diff 94 $ hg diff
95 diff -r 87495ea7c9ec a 95 diff -r 87495ea7c9ec a
96 --- a/a Thu Jan 01 00:00:00 1970 +0000 96 --- a/a Thu Jan 01 00:00:00 1970 +0000
97 +++ b/a Thu Jan 01 00:00:00 1970 +0000 97 +++ b/a * (glob)
98 @@ -1,1 +1,5 @@ 98 @@ -1,1 +1,5 @@
99 +<<<<<<< destination: 87495ea7c9ec - test: b 99 +<<<<<<< destination: 87495ea7c9ec - test: b
100 b2 100 b2
101 +======= 101 +=======
102 +c 102 +c