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

[Eli Zaretskii]

Index: emacs/man/emerge-xtra.texi
diff -u emacs/man/emerge-xtra.texi:1.3 emacs/man/emerge-xtra.texi:1.4
--- emacs/man/emerge-xtra.texi:1.3      Sat May  6 13:25:54 2006
+++ emacs/man/emerge-xtra.texi  Sat May  6 13:44:24 2006
@@ -12,9 +12,14 @@
   It's not unusual for programmers to get their signals crossed and
 modify the same program in two different directions.  To recover from
 this confusion, you need to merge the two versions.  Emerge makes this
-easier.  For other ways to compare files, see @ref{Comparing Files,,,
-emacs, the Emacs Manual} and @ref{Top, Ediff,, ediff, The Ediff
-Manual}.
+easier.  For other ways to compare files, see
address@hidden
address@hidden Files,,, emacs, the Emacs Manual},
address@hidden iftex
address@hidden
address@hidden Files},
address@hidden ifnottex
+and @ref{Top, Ediff,, ediff, The Ediff Manual}.
 
 @menu
 * Overview of Emerge:: How to start Emerge.  Basic concepts.
@@ -64,7 +69,12 @@
 
   The Emerge commands that take input from existing buffers use only
 the accessible portions of those buffers, if they are narrowed.
address@hidden
 @xref{Narrowing,,, emacs, the Emacs Manual}.
address@hidden iftex
address@hidden
address@hidden
address@hidden ifnottex
 
 
   If a common ancestor version is available, from which the two texts to
@@ -391,7 +401,13 @@
 
 @vindex emerge-startup-hook
   After setting up the merge, Emerge runs the hook
address@hidden  @xref{Hooks,,, emacs, the Emacs Manual}.
address@hidden
address@hidden
address@hidden,,, emacs, the Emacs Manual}.
address@hidden iftex
address@hidden
address@hidden
address@hidden ifnottex
 
 @ignore
    arch-tag: cda63f09-9c5f-4ea1-adb9-4a820fdfb24e