Mercurial > emacs

comparison man/ediff.texi @ 29165:641e43bad886

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2000-05-24 Michael Kifer <kifer@cs.sunysb.edu> * ediff-diff.el (ediff-forward-word): take syntactic word class into account. (ediff-test-utility,ediff-diff-mandatory-option, ediff-reset-diff-options): utilities for proper initialization of ediff-diff-options and ediff-diff3-options on Windows. * ediff-init.el (ediff-merge-filename-prefix): new customizable variable. * ediff-mult.el (ediff-filegroup-action): use ediff-merge-filename-prefix.
author Michael Kifer <kifer@cs.stonybrook.edu>
date Wed, 24 May 2000 17:31:16 +0000
parents 203ba1f77b7b
children 983e65f12610
comparison
equal deleted inserted replaced
29164:71275ee34b42 29165:641e43bad886
973 @code{ediff-maybe-save-and-delete-merge}, which is a hook in 973 @code{ediff-maybe-save-and-delete-merge}, which is a hook in
974 @code{ediff-quit-merge-hook}. The user can supply a different hook, if 974 @code{ediff-quit-merge-hook}. The user can supply a different hook, if
975 necessary. 975 necessary.
976 976
977 The variable @code{ediff-autostore-merges} is buffer-local, so it can be 977 The variable @code{ediff-autostore-merges} is buffer-local, so it can be
978 set in a per-buffer manner. Therefore, use @code{setq-default} to globally 978 set on a per-buffer basis. Therefore, use @code{setq-default} to change
979 change this variable. 979 this variable globally.
980 980
981 @cindex Multi-file patches 981 @cindex Multi-file patches
982 A multi-file patch is a concatenated output of several runs of the Unix 982 A multi-file patch is a concatenated output of several runs of the Unix
983 @command{diff} command (some versions of @command{diff} let you create a 983 @command{diff} command (some versions of @command{diff} let you create a
984 multi-file patch in just one run). Ediff facilitates creation of 984 multi-file patch in just one run). Ediff facilitates creation of
1977 necessary. 1977 necessary.
1978 1978
1979 The variable @code{ediff-autostore-merges} is buffer-local, so it can be 1979 The variable @code{ediff-autostore-merges} is buffer-local, so it can be
1980 set in a per-buffer manner. Therefore, use @code{setq-default} to globally 1980 set in a per-buffer manner. Therefore, use @code{setq-default} to globally
1981 change this variable. 1981 change this variable.
1982
1983 @vindex ediff-merge-filename-prefix
1984 When merge buffers are saved automatically as directed by
1985 @code{ediff-autostore-merges}, Ediff attaches a prefix to each file, as
1986 specified by the variable @code{ediff-merge-filename-prefix}. The default
1987 is @code{merge_}, but this can be changed by the user.
1982 1988
1983 @node Support for Version Control, Customizing the Mode Line, Merging and diff3, Customization 1989 @node Support for Version Control, Customizing the Mode Line, Merging and diff3, Customization
1984 @section Support for Version Control 1990 @section Support for Version Control
1985 1991
1986 1992