Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 5281:a176f9c8b26e
convert: rename a class and a function
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 01 Sep 2007 02:49:18 -0300 |
parents | 90d9ec0dc69d |
children | 17ed9b9a0d03 |