Merge branch 'jc/combine-diff-many-parents'
[git] / git-gui / windows /
drwxr-xr-x   ..
-rw-r--r-- 687 git-gui.sh