git-gui: respect conflict marker size
[gitweb.git] / windows /
drwxr-xr-x   parent (dest: ; base: 4590307)
-rw-r--r-- 687 git-gui.sh