You can stop merge keeping all current changes in the working directory using stash. Witch stops the on going merge automatically.
Source code viewergit stash savegit stash popProgramming Language: Bash