Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-merg.el @ 134:34a5b81f86ba r20-2b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-2b1
author cvs
date Mon, 13 Aug 2007 09:30:11 +0200
parents 6a378aca36af
children 2d532a89d707
comparison
equal deleted inserted replaced
133:b27e67717092 134:34a5b81f86ba
22 ;; Boston, MA 02111-1307, USA. 22 ;; Boston, MA 02111-1307, USA.
23 23
24 ;;; Code: 24 ;;; Code:
25 25
26 (provide 'ediff-merg) 26 (provide 'ediff-merg)
27
28 (defgroup ediff-merge nil
29 "Merging utilities"
30 :prefix "ediff-"
31 :group 'ediff)
32
27 33
28 ;; compiler pacifier 34 ;; compiler pacifier
29 (defvar ediff-window-A) 35 (defvar ediff-window-A)
30 (defvar ediff-window-B) 36 (defvar ediff-window-B)
31 (defvar ediff-window-C) 37 (defvar ediff-window-C)
42 ;; end pacifier 48 ;; end pacifier
43 49
44 (require 'ediff-init) 50 (require 'ediff-init)
45 51
46 52
47 (defvar ediff-default-variant 'combined 53 (defcustom ediff-default-variant 'combined
48 "*The variant to be used as a default for buffer C in merging. 54 "*The variant to be used as a default for buffer C in merging.
49 Valid values are the symbols `default-A', `default-B', and `combined'.") 55 Valid values are the symbols `default-A', `default-B', and `combined'."
50 56 :type '(radio (const default-A) (const default-B) (const combined))
51 (defvar ediff-combination-pattern 57 :group 'ediff-merge)
58
59 (defcustom ediff-combination-pattern
52 '("<<<<<<<<<<<<<< variant A" ">>>>>>>>>>>>>> variant B" "======= end of combination") 60 '("<<<<<<<<<<<<<< variant A" ">>>>>>>>>>>>>> variant B" "======= end of combination")
53 "*Pattern to be used for combining difference regions in buffers A and B. 61 "*Pattern to be used for combining difference regions in buffers A and B.
54 The value is (STRING1 STRING2 STRING3). The combined text will look like this: 62 The value is (STRING1 STRING2 STRING3). The combined text will look like this:
55 63
56 STRING1 64 STRING1
57 diff region from variant A 65 diff region from variant A
58 STRING2 66 STRING2
59 diff region from variant B 67 diff region from variant B
60 STRING3 68 STRING3
61 ") 69 "
70 :type '(list string string string)
71 :group 'ediff-merge)
62 72
63 (ediff-defvar-local ediff-show-clashes-only nil 73 (ediff-defvar-local ediff-show-clashes-only nil
64 "*If t, show only those diff regions where both buffers disagree with the ancestor. 74 "*If t, show only those diff regions where both buffers disagree with the ancestor.
65 This means that regions that have status prefer-A or prefer-B will be 75 This means that regions that have status prefer-A or prefer-B will be
66 skiped over. Nil means show all regions.") 76 skiped over. Nil means show all regions.")