hg: ediff emacs merge with-ancestor