Mercurial > hg > mercurial-crew-with-dirclash
diff doc/hgrc.5.txt @ 5054:ec70fd08e16c
Update imerge for new filemerge interface
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Wed, 01 Aug 2007 23:59:19 -0700 |
parents | 97369f6a6bb6 |
children | ea7b982b6c08 |