...
ediff window split
magit
ibuffer