Merge branch 'rs/use-modern-git-merge-syntax' into pu
treea220faf9b38aa54b55702d5002a91345b7566dd7
-rw-r--r-- 170 .gitattributes
-rw-r--r-- 97 .gitignore
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11731 Makefile
-rwxr-xr-x 1372 git-gui--askpass
-rwxr-xr-x 100661 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows