[[3-dot diff (Git)|3-dot diff]]を使う。