Mercurial > emacs

comparison lisp/ediff-merg.el @ 90729:6588c6259dfb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 545-562) - Update from CVS - Update from erc--emacs--22 - Merge from gnus--rel--5.10 - erc-iswitchb: Temporarily enable iswitchb mode * gnus--rel--5.10 (patch 172-176) - Merge from emacs--devo--0 - Update from CVS - Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice. Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
author Miles Bader <miles@gnu.org>
date Sat, 16 Dec 2006 01:29:26 +0000
parents d1c5430c5bff 402a04b0362f
children 95d0cdf160ea
comparison
equal deleted inserted replaced
90728:a65a92d83186 90729:6588c6259dfb
60 60
61 (defcustom ediff-combination-pattern 61 (defcustom ediff-combination-pattern
62 '("<<<<<<< variant A" A ">>>>>>> variant B" B "####### Ancestor" Ancestor "======= end") 62 '("<<<<<<< variant A" A ">>>>>>> variant B" B "####### Ancestor" Ancestor "======= end")
63 "*Pattern to be used for combining difference regions in buffers A and B. 63 "*Pattern to be used for combining difference regions in buffers A and B.
64 The value must be a list of the form 64 The value must be a list of the form
65 (STRING1 bufspec1 STRING2 bufspec2 STRING3 bufspec3 STRING4) 65 \(STRING1 bufspec1 STRING2 bufspec2 STRING3 bufspec3 STRING4)
66 where bufspec is the symbol A, B, or Ancestor. For instance, if the value is 66 where bufspec is the symbol A, B, or Ancestor. For instance, if the value is
67 '(STRING1 A STRING2 Ancestor STRING3 B STRING4) then the 67 '(STRING1 A STRING2 Ancestor STRING3 B STRING4) then the
68 combined text will look like this: 68 combined text will look like this:
69 69
70 STRING1 70 STRING1
80 :group 'ediff-merge) 80 :group 'ediff-merge)
81 81
82 (defcustom ediff-show-clashes-only nil 82 (defcustom ediff-show-clashes-only nil
83 "*If t, show only those diff regions where both buffers disagree with the ancestor. 83 "*If t, show only those diff regions where both buffers disagree with the ancestor.
84 This means that regions that have status prefer-A or prefer-B will be 84 This means that regions that have status prefer-A or prefer-B will be
85 skipped over. nil means show all regions." 85 skipped over. A value of nil means show all regions."
86 :type 'boolean 86 :type 'boolean
87 :group 'ediff-merge 87 :group 'ediff-merge
88 ) 88 )
89 (make-variable-buffer-local 'ediff-show-clashes-only) 89 (make-variable-buffer-local 'ediff-show-clashes-only)
90 90