* lisp/vc/ediff-util.el (ediff-arrange-autosave-in-merge-jobs): Don't make backup files when `make-backup-files' is nil (bug#21599).
* lisp/vc/ediff-util.el (ediff-arrange-autosave-in-merge-jobs): Don't make backup files when `make-backup-files' is nil (bug#21599).