comparison mercurial/ui.py @ 2810:ca06d35af65e

Rename merge.allow -> merge.branchmerge
author Matt Mackall <mpm@selenic.com>
date Mon, 07 Aug 2006 23:53:04 -0500
parents ad4155e757da
children 345bac2bc4ec 2efa9b8aed30
comparison
equal deleted inserted replaced
2809:1c6beafbae97 2810:ca06d35af65e