aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-02-22 07:57:46 +0000
committerEli Zaretskii2001-02-22 07:57:46 +0000
commit089d639f33dbe16832e82fc52629dd8fc360519d (patch)
tree55ecd8c71a394575f761a88a057a515fc1f1b81a
parent851e6368e28e5aa7005c7d5f3cef1b40a42ff438 (diff)
downloademacs-089d639f33dbe16832e82fc52629dd8fc360519d.tar.gz
emacs-089d639f33dbe16832e82fc52629dd8fc360519d.zip
Remove two more redundant index entries.
-rw-r--r--man/files.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/man/files.texi b/man/files.texi
index da7e3dca88e..d7a26d21f11 100644
--- a/man/files.texi
+++ b/man/files.texi
@@ -2404,7 +2404,7 @@ Diff mode, a major mode for viewing and editing patches, either as
2404@findex smerge-mode 2404@findex smerge-mode
2405@cindex failed merges 2405@cindex failed merges
2406@cindex merges, failed 2406@cindex merges, failed
2407@pindex diff3 2407@cindex comparing 3 files (@code{diff3})
2408 You can use @kbd{M-x smerge-mode} to turn on Smerge mode, a minor 2408 You can use @kbd{M-x smerge-mode} to turn on Smerge mode, a minor
2409mode for editing output from the @command{diff3} program. This is 2409mode for editing output from the @command{diff3} program. This is
2410typically the result of a failed merge from a version control system 2410typically the result of a failed merge from a version control system
@@ -2519,7 +2519,7 @@ compiling it.
2519@section File Archives 2519@section File Archives
2520@cindex mode, tar 2520@cindex mode, tar
2521@cindex Tar mode 2521@cindex Tar mode
2522@pindex tar 2522@cindex file archives
2523 2523
2524 A file whose name ends in @samp{.tar} is normally an @dfn{archive} 2524 A file whose name ends in @samp{.tar} is normally an @dfn{archive}
2525made by the @code{tar} program. Emacs views these files in a special 2525made by the @code{tar} program. Emacs views these files in a special