diff contrib/mergetools.hgrc @ 20818:c7d543eebe1a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 21 Mar 2014 17:20:56 -0500
parents 3de9b1f9ebc3
children 12c7cea6235c
line wrap: on
line diff