projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bae1fa4
)
* lisp/ediff-ptch.el (ediff-fixup-patch-map): Doc fix.
author
Glenn Morris
<rgm@gnu.org>
Thu, 10 Feb 2011 03:24:46 +0000
(19:24 -0800)
committer
Glenn Morris
<rgm@gnu.org>
Thu, 10 Feb 2011 03:24:46 +0000
(19:24 -0800)
lisp/ChangeLog
patch
|
blob
|
history
lisp/ediff-ptch.el
patch
|
blob
|
history
diff --git
a/lisp/ChangeLog
b/lisp/ChangeLog
index 8f6f2ee821b097c757dc03f90995bab2216f3cd1..7d460219db012d60fc179c2c79464f5ec4d3d82c 100644
(file)
--- 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 a9e19c79babacf279e0f4c2348956b007fef20bf..26de8ca5828c5372307b5475baad3184455d40a9 100644
(file)
--- 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 advi
c
e:
+Please advi
s
e:
Type `y' to use %s as the target;
Type `n' to use %s as the target.
"