git-mergetool: improve error code paths and messages#1827

phil-blain wants to merge 5 commits intogitgitgadget:mastergitgitgadget/git:masterfrom

phil-blain:absent-mergetoolphil-blain/git:absent-mergetoolCopy head branch name to clipboard