diff contrib/mergetools.hgrc @ 12224:d212c043805d

i18n: merge with stable
author Martin Geisler <mg@lazybytes.net>
date Sat, 21 Aug 2010 11:22:49 +0200
parents 48e549d7c6ae
children a87a0fcb412f
line wrap: on
line diff