Open files with merge conflicts from the git status listing
Merge pull request #9 from rcj/master

Allow opening files with merge conflicts from git status listing