@SStatik @sogrady ediff (in @emacs).