comparison COPYING @ 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 e585303fbc5c
children 143c8e4dc22d
comparison
equal deleted inserted replaced
585:f013ca072bd9 586:f01721161532