Mercurial > emacs
comparison src/buffer.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 | e93aafd2c52b |
| children | fb6bed3fabd5 732c5740ca8f 0ca0d9181b5e |
comparison
equal
deleted
inserted
replaced
| 66686:ca587da00ba1 | 66687:26faad662ac6 |
|---|