Abort on failed rebase
Add `ediff-marked-files'