git-gui: Move merge support into a namespace