Mercurial: automatically merge ChangeLogs