comparison contrib/mergetools.hgrc @ 9795:8eacee85d019

merge with stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 08 Nov 2009 17:03:24 +0100
parents 01bd0efef1b5
children 6b354a763617
comparison
equal deleted inserted replaced
9789:79e749b26b2b 9795:8eacee85d019