Adding Merge Abort, Tool and launch mergetool on conflict#389

bordaigorl wants to merge 3 commits into

kemayo:python3kemayo/sublime-text-git:python3from

bordaigorl:mergetoolbordaigorl/sublime-text-git:mergetoolCopy head branch name to clipboard