Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint
[gitweb.git] / git-gui / windows /
drwxr-xr-x   parent (dest: git-gui; base: 174f9e622fde6c874ba3d53eb05d0f37d6001ba5)
-rwxr-xr-x 687 git-gui.sh