Mercurial > evolve
comparison tests/test-evolve-stop.t @ 3592:7a5c3175015e mercurial-4.2
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 |
comparison
equal
deleted
inserted
replaced
| 3591:98941c28f3e2 | 3592:7a5c3175015e |
|---|---|
| 142 [255] | 142 [255] |
| 143 | 143 |
| 144 $ hg diff | 144 $ hg diff |
| 145 diff -r cb6a2ab625bb d | 145 diff -r cb6a2ab625bb d |
| 146 --- a/d Thu Jan 01 00:00:00 1970 +0000 | 146 --- a/d Thu Jan 01 00:00:00 1970 +0000 |
| 147 +++ b/d Thu Jan 01 00:00:00 1970 +0000 | 147 +++ b/d * (glob) |
| 148 @@ -1,1 +1,5 @@ | 148 @@ -1,1 +1,5 @@ |
| 149 +<<<<<<< destination: cb6a2ab625bb - test: added c | 149 +<<<<<<< destination: cb6a2ab625bb - test: added c |
| 150 bar | 150 bar |
| 151 +======= | 151 +======= |
| 152 +foo | 152 +foo |