Add Magit and split ediff windows the right way