Merge branch 'nm/maint-conflicted-submodule-entries'
[git] / git-gui / windows /
drwxr-xr-x   ..
-rw-r--r-- 687 git-gui.sh