Mercurial says “abort: outstanding uncommitted changes”, I don’t want to commit
If you don’t want to use shelve, you can do it with just 3 commands: hg diff > mylocalchanges.txt hg revert -a # Do your merge here, once you are done, import back your local mods hg import –no-commit mylocalchanges.txt