[Emacs-diffs] Changes to emacs/man/files.texi

[Chong Yidong]

Index: emacs/man/files.texi
diff -u emacs/man/files.texi:1.133 emacs/man/files.texi:1.134
--- emacs/man/files.texi:1.133  Tue Feb 28 08:13:50 2006
+++ emacs/man/files.texi        Thu Mar 16 03:19:56 2006
@@ -3037,8 +3037,8 @@
 mode provides commands to resolve conflicts by selecting specific
 changes.
 
-  See also @ref{Emerge}, and @ref{Top,,, ediff, The Ediff Manual}, for
-convenient facilities for merging two similar files.
+  @inforef{Emerge,, emacs-xtra} for the Emerge facility, which
+provides a powerful interface for merging files.
 
 @node Misc File Ops
 @section Miscellaneous File Operations