git-gui: stop using deprecated merge syntax
[gitweb.git] / windows /
drwxr-xr-x   parent (dest: ; base: b5f325c)
-rwxr-xr-x 687 git-gui.sh