git-gui: maintain backwards compatibility for merge syntax