hg-fast-export: Compare HG revisions when merging