comparison mercurial/changegroup.py @ 2824:ca06d35af65e

Rename merge.allow -> merge.branchmerge
author Matt Mackall <mpm@selenic.com>
date Mon, 07 Aug 2006 23:53:04 -0500
parents fe1689273f84
children 025f68f22ae2
comparison
equal deleted inserted replaced
2823:1c6beafbae97 2824:ca06d35af65e