Mercurial > evolve
diff COPYING @ 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 | e585303fbc5c |
children | 143c8e4dc22d |
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Thu, 27 Sep 2012 16:40:25 +0200 |
parents | e585303fbc5c |
children | 143c8e4dc22d |