Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 3542:c3043ebe40a0
use untrusted settings in hgwebdir
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 26 Oct 2006 19:25:45 +0200 |
parents | 798bcde0c9c2 |
children | 3b4e00cba57a |
comparison
equal
deleted
inserted
replaced
3541:881064004fd0 | 3542:c3043ebe40a0 |
---|