Merge branch 'nd/remote-plural-ours-plus-theirs' into maint
[gitweb.git] / git-gui / windows /
drwxr-xr-x   parent (dest: git-gui; base: 4e327bb4c251fc642660e35252543c830d2ca2b7)
-rwxr-xr-x 687 git-gui.sh