Merge branch 'tr/maint-merge-ours-clarification' (early part)
[git] / git-gui / windows /
drwxr-xr-x   ..
-rw-r--r-- 633 git-gui.sh