comparison mercurial/util.py @ 2810:ca06d35af65e

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