[git] diff3 for diff