Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern...
[git] / git-gui / windows /
drwxr-xr-x   ..
-rwxr-xr-x 687 git-gui.sh