Mercurial > emacs
view src/m/f301.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 | 695cf19ef79e |
children | 375f2633d815 |
line wrap: on
line source
/* Machine description file for Fujitsu F301 machines. */ /* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="uxpv" */ #include "delta88k.h" /* arch-tag: a0ed4f18-ecf2-4d9a-853b-36e0f6b45945 (do not change this comment) */