More columns in gvimdiff by default. :)
Use pygmentize to colorize less.