Mercurial > emacs
view man/.cvsignore @ 66687:26faad662ac6
2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-merge.el (ediff-merge-region-is-non-clash): return t, if not
merging.
* ediff-util.el (ediff-previous-difference): don't skip regions that
have merge clashes.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Fri, 04 Nov 2005 05:40:03 +0000 |
parents | adbf7c56937f |
children | 17f1d9e091ba |
line wrap: on
line source
*.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log *.op *.ops *.pg *.pgs *.ps *.tmp *.toc *.tp *.tps *.vr *.vrs Makefile makefile