I use ediff to merge mercurial conflicts (and sometimes git conflicts), but I can't seem to abort. Ediff pops up as soon as a conflict is detected, and quitting and not saving results in mercurial accepting the existing version and drops the commit, saying the destination already has the changes.
I can't seem to suspend and abort the commit because the rebase/merge already has a lock.
What is the workflow for safely aborting a merge, restoring the previous state as though a merge/rebase was never attempted. To be clear, I'm not sure if this is a mercurial/git question or an ediff question.