Mercurial > evolve
diff .hgtags @ 586:f01721161532 stable
evolve: rename conflicting into divergent
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Tue, 23 Oct 2012 15:44:24 +0200 |
parents | fa3621931db0 |
children | cd29c8c8b0a1 |
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Tue, 23 Oct 2012 15:44:24 +0200 |
parents | fa3621931db0 |
children | cd29c8c8b0a1 |