Thu, 27 Sep 2012 16:40:25 +0200 doc: rename conflicting to divergent. stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 27 Sep 2012 16:40:25 +0200] rev 575
doc: rename conflicting to divergent.
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip