contrib/mergetools.hgrc
changeset 22859 513c0ba61db8
parent 22461 864bc2f4279b