diff contrib/buildrpm @ 2824:ca06d35af65e

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