diff options
| author | Glenn Morris | 2011-02-09 19:24:46 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-02-09 19:24:46 -0800 |
| commit | dc4c6a7add965cbe7d0b9a357f9403defa96c0da (patch) | |
| tree | d8f50bdb3e994b7a9806d39766dbadf5f2e3bf7a /lisp | |
| parent | bae1fa42dc24348d6ba303b633a3cf19dec625fa (diff) | |
| download | emacs-dc4c6a7add965cbe7d0b9a357f9403defa96c0da.tar.gz emacs-dc4c6a7add965cbe7d0b9a357f9403defa96c0da.zip | |
* lisp/ediff-ptch.el (ediff-fixup-patch-map): Doc fix.
Diffstat (limited to 'lisp')
| -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 @@ | |||
| 1 | 2011-02-10 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * ediff-ptch.el (ediff-fixup-patch-map): Doc fix. | ||
| 4 | |||
| 1 | 2011-02-08 Glenn Morris <rgm@gnu.org> | 5 | 2011-02-08 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * faces.el (face-attr-match-p): Handle the obsolete :bold and | 7 | * 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 | |||
| 417 | are two possible targets for applying the patch. | 417 | are two possible targets for applying the patch. |
| 418 | Both files seem to be plausible alternatives. | 418 | Both files seem to be plausible alternatives. |
| 419 | 419 | ||
| 420 | Please advice: | 420 | Please advise: |
| 421 | Type `y' to use %s as the target; | 421 | Type `y' to use %s as the target; |
| 422 | Type `n' to use %s as the target. | 422 | Type `n' to use %s as the target. |
| 423 | " | 423 | " |