diff mercurial/repo.py @ 2810:ca06d35af65e

Rename merge.allow -> merge.branchmerge
author Matt Mackall <mpm@selenic.com>
date Mon, 07 Aug 2006 23:53:04 -0500
parents ffb895f16925
children 345bac2bc4ec
line wrap: on
line diff