Mercurial > evolve
comparison tests/test-evolve-obshistory-content-divergent.t @ 4490:7a5c6109ee84
branching: merge with test consolidation
Conflict were simple once isolated.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 10 Apr 2019 16:59:28 +0200 |
| parents | 11b775fddda8 |
| children | f7afd3a158e3 f16274729530 |
comparison
equal
deleted
inserted
replaced
| 4489:818e8190e867 | 4490:7a5c6109ee84 |
|---|