bug#21599: Autosave seems to be forced during merge

[Saurabh T]

It appears the highlighted (secondlast) line below in ediff-util.el may be 
forcing the autosave. Can someone confirm?

Is there any way to override this? I abandon merges all the time and do not 
want these files lying around. Note that I do have
(setq make-backup-files nil)
in .emacs.

Thank you.
saurabh

;; This executes in control buffer and sets auto-save, visited file name, etc,
;; in the merge buffer
(defun ediff-arrange-autosave-in-merge-jobs (merge-buffer-file)
  (if (not ediff-merge-job)
      ()
    (if (stringp merge-buffer-file)
        (setq ediff-autostore-merges t
              ediff-merge-store-file merge-buffer-file))
    (if (stringp ediff-merge-store-file)
        (progn
          ;; save before leaving ctl buffer
          (ediff-verify-file-merge-buffer ediff-merge-store-file)
          (setq merge-buffer-file ediff-merge-store-file)
          (ediff-with-current-buffer ediff-buffer-C
            (set-visited-file-name merge-buffer-file))))
    (ediff-with-current-buffer ediff-buffer-C
      (setq buffer-offer-save t) ; ask before killing buffer
      ;; make sure the contents is auto-saved
===>  (auto-save-mode 1)) <===
    ))