diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-02-12 18:40:43 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-02-12 18:40:43 -0500 |
| commit | 84eb0351d8be4811897c8cf62a69757ff5d14001 (patch) | |
| tree | 80162dabf78b97982b32679e2cb7e377d5b12d01 /lisp/vc | |
| parent | cdfa139da44fd9b1a5425400635e474e85d866f4 (diff) | |
| parent | 165bc5a066990bace024c04ba431f140a25d0bfd (diff) | |
| download | emacs-84eb0351d8be4811897c8cf62a69757ff5d14001.tar.gz | |
Merge changes from emacs-23 branch
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/ediff-mult.el | 2 | ||||
| -rw-r--r-- | lisp/vc/ediff-ptch.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el index 2aea75aa427..cadcdec29b4 100644 --- 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))) diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el index 468d12057ab..d930a1bec69 100644 --- a/lisp/vc/ediff-ptch.el +++ b/lisp/vc/ediff-ptch.el @@ -417,7 +417,7 @@ Ediff has inferred that are two possible targets for applying the patch. Both files seem to be plausible alternatives. -Please advice: +Please advise: Type `y' to use %s as the target; Type `n' to use %s as the target. " |