Undo latest pull a git merge with conflicts

-

Sublime Tools for Git

-

git-extras utilities for git

-