git ours, git theirs, git diff style 3