After starting a merge, you might want to stop the merge and return everything to its pre-merge state. Use --abort:

git merge --abort