From dc4c6a7add965cbe7d0b9a357f9403defa96c0da Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 9 Feb 2011 19:24:46 -0800 Subject: [PATCH] * lisp/ediff-ptch.el (ediff-fixup-patch-map): Doc fix. --- lisp/ChangeLog | 4 ++++ lisp/ediff-ptch.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 + + * ediff-ptch.el (ediff-fixup-patch-map): Doc fix. + 2011-02-08 Glenn Morris * 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. " -- 2.39.5