Merge branch 'ss/git-gui-mergetool'gitgui-0.14.0
treeceab08c1317f01114d7283aba6d3fde72977bddd
-rw-r--r-- 84 .gitattributes
-rw-r--r-- 97 .gitignore
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11667 Makefile
-rwxr-xr-x 1372 git-gui--askpass
-rwxr-xr-x 96857 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows