Abort a Git Merge

If you do "git status" while having a merge conflict, the first thing git shows you is how to abort the merge.

as long as you did not commit you can type

git merge --abort

just as the command line suggested.