Merge branch 'jc/remove-treesame-parent-in-simplify-merges'
[git] / git-gui / windows /
drwxr-xr-x   ..
-rw-r--r-- 687 git-gui.sh