Re: Mercurial: automatically merge ChangeLogs