Cacher is the code snippet organizer for pro developers

git merge --abort

This attempts to reset your working copy to whatever state it was in before the merge. That