diff contrib/mergetools.hgrc @ 16451:9c431cfdca12

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Apr 2012 16:50:25 -0500
parents a87a0fcb412f
children 93bc65e970c0
line wrap: on
line diff