diff mercurial/dirstate.py @ 2810:ca06d35af65e

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