Mercurial > evolve
diff tests/test-corrupt.t @ 359:43f79983f638
merge with conflicting detection
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Wed, 11 Jul 2012 15:20:22 +0200 |
parents | a140d1857931 |
children | 6989d8fe4ed2 |
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Wed, 11 Jul 2012 15:20:22 +0200 |
parents | a140d1857931 |
children | 6989d8fe4ed2 |