git view merge conflicts command line