view src/.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 e5fe1e4d0e09
line wrap: on
line source

*-spd
*.core
*.pdb
.gdb_history
Makefile
makefile
Makefile.c
TAGS-LISP
_gdbinit
bootstrap-emacs
config.h
config.stamp
emacs
emacs-*
epaths.h
gdb.ini
obj
prefix-args
stamp-oldxmenu
temacs
buildobj.lst