Mercurial > hg > mercurial-crew-with-dirclash
diff doc/hgrc.5.txt @ 4058:e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 30 Jan 2007 19:09:08 -0200 |
parents | a8a8ecf909db |
children | 51e52db6b40d 54b735135fd3 |