diff contrib/mergetools.hgrc @ 22378:c828b61e0635

merge with stable
author Augie Fackler <raf@durin42.com>
date Tue, 09 Sep 2014 13:47:50 -0400
parents 33020e87f8c5
children 864bc2f4279b
line wrap: on
line diff