>>496
diff
Emacs なら ediff