Mercurial > emacs

changeset 36274:91f2160d4468

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove two more redundant index entries.
author Eli Zaretskii <eliz@gnu.org>
date Thu, 22 Feb 2001 07:57:46 +0000
parents 0c4cb98fb3f4
children 44540d398934
files man/files.texi
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/man/files.texi	Thu Feb 22 01:49:37 2001 +0000
+++ b/man/files.texi	Thu Feb 22 07:57:46 2001 +0000
@@ -2404,7 +2404,7 @@
 @findex smerge-mode
 @cindex failed merges
 @cindex merges, failed
-@pindex diff3
+@cindex comparing 3 files (@code{diff3})
   You can use @kbd{M-x smerge-mode} to turn on Smerge mode, a minor
 mode for editing output from the @command{diff3} program.  This is
 typically the result of a failed merge from a version control system
@@ -2519,7 +2519,7 @@
 @section File Archives
 @cindex mode, tar
 @cindex Tar mode
-@pindex tar
+@cindex file archives
 
   A file whose name ends in @samp{.tar} is normally an @dfn{archive}
 made by the @code{tar} program.  Emacs views these files in a special