HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs--rel--22
[bpt/emacs.git]
/
lisp
/
ediff-merg.el
diff --git
a/lisp/ediff-merg.el
b/lisp/ediff-merg.el
index
7f0eea2
..
79a9c48
100644
(file)
--- a/
lisp/ediff-merg.el
+++ b/
lisp/ediff-merg.el
@@
-1,7
+1,7
@@
;;; ediff-merg.el --- merging utilities
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
;;; ediff-merg.el --- merging utilities
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006
, 2007
Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
@@
-26,7
+26,6
@@
;;; Code:
;;; Code:
-(provide 'ediff-merg)
;; compiler pacifier
(defvar ediff-window-A)
;; compiler pacifier
(defvar ediff-window-A)
@@
-63,7
+62,7
@@
Valid values are the symbols `default-A', `default-B', and `combined'."
'("<<<<<<< variant A" A ">>>>>>> variant B" B "####### Ancestor" Ancestor "======= end")
"*Pattern to be used for combining difference regions in buffers A and B.
The value must be a list of the form
'("<<<<<<< variant A" A ">>>>>>> variant B" B "####### Ancestor" Ancestor "======= end")
"*Pattern to be used for combining difference regions in buffers A and B.
The value must be a list of the form
-(STRING1 bufspec1 STRING2 bufspec2 STRING3 bufspec3 STRING4)
+
\
(STRING1 bufspec1 STRING2 bufspec2 STRING3 bufspec3 STRING4)
where bufspec is the symbol A, B, or Ancestor. For instance, if the value is
'(STRING1 A STRING2 Ancestor STRING3 B STRING4) then the
combined text will look like this:
where bufspec is the symbol A, B, or Ancestor. For instance, if the value is
'(STRING1 A STRING2 Ancestor STRING3 B STRING4) then the
combined text will look like this:
@@
-83,7
+82,7
@@
STRING4
(defcustom ediff-show-clashes-only nil
"*If t, show only those diff regions where both buffers disagree with the ancestor.
This means that regions that have status prefer-A or prefer-B will be
(defcustom ediff-show-clashes-only nil
"*If t, show only those diff regions where both buffers disagree with the ancestor.
This means that regions that have status prefer-A or prefer-B will be
-skipped over. nil means show all regions."
+skipped over.
A value of
nil means show all regions."
:type 'boolean
:group 'ediff-merge
)
:type 'boolean
:group 'ediff-merge
)
@@
-390,6
+389,9
@@
Combining is done according to the specifications in variable
)))
)))
+(provide 'ediff-merg)
+
+
;;; Local Variables:
;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
;;; Local Variables:
;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)