Mercurial > evolve
comparison tests/test-stabilize-conflict.t @ 2613:3d432af2f6cd stable
merge with default
Integrate new development around obsfate.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 16 Jun 2017 19:22:38 +0200 |
| parents | 9f42f819267b |
| children | 90ab79764ce4 b6e50897b94e |
comparison
equal
deleted
inserted
replaced
| 2594:a3fbe5293bf6 | 2613:3d432af2f6cd |
|---|