Mercurial > evolve
comparison README @ 533:87c41ef95ebf stable
test conflicting conflicting (sic) resolution
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Thu, 30 Aug 2012 13:50:17 +0200 |
parents | c9983eb6969c |
children | 8c5da9e75ae0 |
comparison
equal
deleted
inserted
replaced
532:744db7a27dd0 | 533:87c41ef95ebf |
---|