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