contrib/mergetools.hgrc
changeset 22975 461342e1c8aa
parent 22461 864bc2f4279b