Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/filelog.py @ 2824:ca06d35af65e
Rename merge.allow -> merge.branchmerge
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 07 Aug 2006 23:53:04 -0500 |
parents | 0875cda033fd |
children | 345bac2bc4ec |