Mercurial > evolve
comparison tests/test-stabilize-conflict.t @ 3417:d3a17c67f85c
branching: merge stable back into default
The test change has to be reverted.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 16 Jan 2018 04:32:43 +0100 |
| parents | e1f3e43a50a4 |
| children | 05bd493d496d |
comparison
equal
deleted
inserted
replaced
| 3409:740e1267be6f | 3417:d3a17c67f85c |
|---|