3-way merge conflict viewing in git