diff contrib/mergetools.hgrc @ 17379:7228def3dcc1 stable

merge heads in stable
author Matt Mackall <mpm@selenic.com>
date Tue, 21 Aug 2012 12:26:53 -0500
parents a87a0fcb412f
children 93bc65e970c0
line wrap: on
line diff