Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 3416:bb00a5a92c30
Add a test for the acl extension
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 16 Oct 2006 15:38:53 -0300 |
parents | d2b55e3c4e25 |
children | ef2e990f9047 |