Mercurial > emacs

comparison man/files.texi @ 90370:e3bacb89536a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-46 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 157-163) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 58-61) - Update from CVS
author Miles Bader <miles@gnu.org>
date Sun, 19 Mar 2006 19:43:57 +0000
parents 5754737d1e04 91970b147f39
children e6bf73e43cf4
comparison
equal deleted inserted replaced
90369:88810aee3a45 90370:e3bacb89536a
3035 typically the result of a failed merge from a version control system 3035 typically the result of a failed merge from a version control system
3036 ``update'' outside VC, due to conflicting changes to a file. Smerge 3036 ``update'' outside VC, due to conflicting changes to a file. Smerge
3037 mode provides commands to resolve conflicts by selecting specific 3037 mode provides commands to resolve conflicts by selecting specific
3038 changes. 3038 changes.
3039 3039
3040 See also @ref{Emerge}, and @ref{Top,,, ediff, The Ediff Manual}, for 3040 @inforef{Emerge,, emacs-xtra} for the Emerge facility, which
3041 convenient facilities for merging two similar files. 3041 provides a powerful interface for merging files.
3042 3042
3043 @node Misc File Ops 3043 @node Misc File Ops
3044 @section Miscellaneous File Operations 3044 @section Miscellaneous File Operations
3045 3045
3046 Emacs has commands for performing many other operations on files. 3046 Emacs has commands for performing many other operations on files.