comparison contrib/hgk @ 2810:ca06d35af65e

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