comparison contrib/mergetools.hgrc @ 17856:917a37b76845

merge with stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 23 Oct 2012 09:28:42 +0200
parents 93bc65e970c0
children bafbfe0b450c
comparison
equal deleted inserted replaced
17853:653d2afdaf88 17856:917a37b76845