diff .hgignore @ 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 41688ca951e7
children a7bad80b7700 854421a48e0c
line wrap: on
line diff