Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
[git] / git-gui / windows /
drwxr-xr-x   ..
-rwxr-xr-x 687 git-gui.sh