diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-02-09 19:24:46 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-02-09 19:24:46 -0800 |
| commit | dc4c6a7add965cbe7d0b9a357f9403defa96c0da (patch) | |
| tree | d8f50bdb3e994b7a9806d39766dbadf5f2e3bf7a | |
| parent | bae1fa42dc24348d6ba303b633a3cf19dec625fa (diff) | |
| download | emacs-dc4c6a7add965cbe7d0b9a357f9403defa96c0da.tar.gz | |
* lisp/ediff-ptch.el (ediff-fixup-patch-map): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/ediff-ptch.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8f6f2ee821b..7d460219db0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-02-10 Glenn Morris <rgm@gnu.org> + + * ediff-ptch.el (ediff-fixup-patch-map): Doc fix. + 2011-02-08 Glenn Morris <rgm@gnu.org> * faces.el (face-attr-match-p): Handle the obsolete :bold and diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el index a9e19c79bab..26de8ca5828 100644 --- a/lisp/ediff-ptch.el +++ b/lisp/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. " |