git-gui 0.14
Merge branch 'ss/git-gui-mergetool'