comparison contrib/mergetools.hgrc @ 10657:909a99b92f67

Merge with stable
author Martin Geisler <mg@lazybytes.net>
date Fri, 12 Mar 2010 00:02:39 +0100
parents 6b354a763617
children bdc8f048166e
comparison
equal deleted inserted replaced
10655:f63fb5c0cf67 10657:909a99b92f67