/[emacs]/emacs/lisp/ediff-merg.el
ViewVC logotype

Diff of /emacs/lisp/ediff-merg.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.20 by pj, Mon Jul 16 07:46:48 2001 UTC revision 1.21 by pj, Thu Dec 20 18:38:32 2001 UTC
# Line 82  STRING4 Line 82  STRING4
82  (defcustom ediff-show-clashes-only nil  (defcustom ediff-show-clashes-only nil
83    "*If t, show only those diff regions where both buffers disagree with the ancestor.    "*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  This means that regions that have status prefer-A or prefer-B will be
85  skipped over.  Nil means show all regions."  skipped over.  nil means show all regions."
86    :type 'boolean    :type 'boolean
87    :group 'ediff-merge    :group 'ediff-merge
88    )    )

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.21

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26