diff .hgignore @ 856:1844bb6aed56 stable

test: get rid of all reference to conflicting changesets They are now called divergent for a long time.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Thu, 20 Feb 2014 13:32:04 -0800
parents 41688ca951e7
children a7bad80b7700 854421a48e0c
line wrap: on
line diff