git-gui: respect conflict marker size