Add fix to allow return from magit-status from ediff