diff contrib/mergetools.hgrc @ 10264:d6512b3e9ac0

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 19 Jan 2010 22:45:09 -0600
parents 01bd0efef1b5
children 6b354a763617
line wrap: on
line diff