Mercurial > emacs
comparison src/xterm.h @ 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 | ad24f42046b1 |
children | 8c33a73a9eb2 2a679c81f552 b1c1fc853d2f |
comparison
equal
deleted
inserted
replaced
66686:ca587da00ba1 | 66687:26faad662ac6 |
---|