summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-util.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-11-22 23:03:56 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-11-22 23:03:56 -0800
commitee7683ebb70c308e596103e379ef6b91d001eebc (patch)
tree45382191619e27df7106a8d990bc03903d0fa03f /lisp/vc/ediff-util.el
parent6b21de180fba10432988d94d2b8f3e2521be5b17 (diff)
downloademacs-ee7683ebb70c308e596103e379ef6b91d001eebc.tar.gz
emacs-ee7683ebb70c308e596103e379ef6b91d001eebc.tar.bz2
emacs-ee7683ebb70c308e596103e379ef6b91d001eebc.zip
Spelling fixes.
Diffstat (limited to 'lisp/vc/ediff-util.el')
-rw-r--r--lisp/vc/ediff-util.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 5d7d2451422..30df073df12 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -2635,7 +2635,7 @@ delete this buffer in another session as well."
))
;; Kill the variant buffer, according to user directives (ask, kill
-;; unconditionaly, keep)
+;; unconditionally, keep)
;; BUFF is the buffer, BUFF-TYPE is either 'A, or 'B, 'C, 'Ancestor
(defun ediff-dispose-of-variant-according-to-user (buff bufftype ask keep-variants)
;; if this is indirect buffer, kill it and substitute with direct buf