Mercurial > emacs
diff src/w32term.c @ 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 | 824b4c76ae12 |
children | 31fb537a065c db4e74787e6f 5e2d3828e89f |