Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
[git] / git-gui / windows /
drwxr-xr-x   ..
-rwxr-xr-x 687 git-gui.sh