HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comment
[bpt/emacs.git]
/
doc
/
misc
/
ediff.texi
diff --git
a/doc/misc/ediff.texi
b/doc/misc/ediff.texi
index
378eee0
..
826e16c
100644
(file)
--- a/
doc/misc/ediff.texi
+++ b/
doc/misc/ediff.texi
@@
-10,6
+10,7
@@
@setfilename ../../info/ediff
@settitle Ediff User's Manual
@setfilename ../../info/ediff
@settitle Ediff User's Manual
+@documentencoding UTF-8
@synindex vr cp
@synindex fn cp
@synindex pg cp
@synindex vr cp
@synindex fn cp
@synindex pg cp
@@
-25,7
+26,7
@@
This file documents Ediff, a comprehensive visual interface to Unix diff
and patch utilities.
This file documents Ediff, a comprehensive visual interface to Unix diff
and patch utilities.
-Copyright @copyright{} 1995--201
3
Free Software Foundation, Inc.
+Copyright @copyright{} 1995--201
4
Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@quotation
Permission is granted to copy, distribute and/or modify this document
@@
-42,7
+43,8
@@
modify this GNU manual.''
@dircategory Emacs misc features
@direntry
@dircategory Emacs misc features
@direntry
-* Ediff: (ediff). A visual interface for comparing and merging programs.
+* Ediff: (ediff). A visual interface for comparing and
+ merging programs.
@end direntry
@titlepage
@end direntry
@titlepage