Mercurial > evolve
comparison tests/test-stabilize-conflict.t @ 575:36de5e30d3eb stable
doc: rename conflicting to divergent.
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Thu, 27 Sep 2012 16:40:25 +0200 |
| parents | 362e65fc6146 |
| children | 4676650f4f9d |
comparison
equal
deleted
inserted
replaced
| 574:4f5562c92630 | 575:36de5e30d3eb |
|---|