Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
[gitweb.git] / git-gui / windows /
drwxr-xr-x   parent (dest: git-gui; base: 216d29ef257e48f95bc14765d5da17e7854a3109)
-rwxr-xr-x 687 git-gui.sh