diff options
| author | Karl Heuer <kwzh@gnu.org> | 1996-01-05 22:21:28 +0000 |
|---|---|---|
| committer | Karl Heuer <kwzh@gnu.org> | 1996-01-05 22:21:28 +0000 |
| commit | a7acbbe4d48af3113de2dfaf836a42f2a9b6c2b0 (patch) | |
| tree | 9ca09d12c605ce9155e55ad82476c9a6d6ebedcd /lisp/ediff-merg.el | |
| parent | 60d0378e485ded218121a8b8d6ce582e47882fac (diff) | |
| download | emacs-a7acbbe4d48af3113de2dfaf836a42f2a9b6c2b0.tar.gz | |
Comment fixes.
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)) |