Mercurial > hg > mercurial-crew-with-dirclash
diff doc/hgrc.5.txt @ 1664:4338e33c973b
Safer version of FileMerge merge
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 30 Jan 2006 12:02:12 +1300 |
parents | 32a4e6802864 |
children | eabfbd220f39 |