diff options
Diffstat (limited to 'lisp/ediff-merg.el')
| -rw-r--r-- | lisp/ediff-merg.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index ef14c8c436a..9b473816d37 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -137,7 +137,7 @@ skiped over. Nil means show all regions.") (and (string= state-of-merge "combined") (not (string= (ediff-make-combined-diff reg-A reg-B) reg-C))) - ;; was prefered--ignore + ;; was preferred--ignore (string-match "prefer" state-of-merge)) (setq do-not-copy t)) |