Git conflicts should display common ancestor