comparison contrib/hgdiff @ 2824:ca06d35af65e

Rename merge.allow -> merge.branchmerge
author Matt Mackall <mpm@selenic.com>
date Mon, 07 Aug 2006 23:53:04 -0500
parents e7e6504c4989
children 0f308690bda8
comparison
equal deleted inserted replaced
2823:1c6beafbae97 2824:ca06d35af65e