diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2011-11-20 20:35:27 +0100 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2011-11-20 20:35:27 +0100 |
| commit | fe7a3057a38e896a9c4ad12c831fb84a5d808691 (patch) | |
| tree | bcb23e440925fde576409d960a71ee6df320331a /lisp/vc/ediff-util.el | |
| parent | 09f5d05492b6c78421c71858d0d5c4434218b8fc (diff) | |
| download | emacs-fe7a3057a38e896a9c4ad12c831fb84a5d808691.tar.gz | |
Fix typos.
Diffstat (limited to 'lisp/vc/ediff-util.el')
| -rw-r--r-- | lisp/vc/ediff-util.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index df6a7e938af..5d7d2451422 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -452,7 +452,7 @@ to invocation.") (if ediff-3way-job (ediff-with-current-buffer ediff-buffer-C (ediff-nuke-selective-display) - ;; the merge bufer should never be narrowed + ;; the merge buffer should never be narrowed ;; (it can happen if it is on rmail-mode or similar) (if (ediff-with-current-buffer control-buffer ediff-merge-job) (widen)) |