Merge changes from emacs-23 branch

[gnu-emacs] / lisp / vc / ediff-mult.el

diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el
index 2aea75aa427441e118997568c0823e30cfb38d94..cadcdec29b4f82c13b3bf8dcb79ad6b22c9f7fce 100644 (file)
--- a/lisp/vc/ediff-mult.el
+++ b/lisp/vc/ediff-mult.el
@@ -306,7 +306,7 @@ buffers."
   (nth 3 elt))
 (defsubst ediff-get-session-objC (elt)
   (nth 4 elt))
-;; Take the "name" component of the object into acount. ObjA/C/B is of the form
+;; Take the "name" component of the object into account. ObjA/C/B is of the form
 ;; (name . equality-indicator)
 (defsubst ediff-get-session-objA-name (elt)
   (car (nth 2 elt)))