diff contrib/mergetools.hgrc @ 11710:58a038605a2b stable

merge crew and main
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Sat, 31 Jul 2010 11:04:33 +0900
parents 16277f8aca1a
children 48e549d7c6ae
line wrap: on
line diff