annotate 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 |
rev |
line source |
24384
|
1 /* Machine description file for Fujitsu F301 machines. */
|
|
2
|
|
3 /* The following line tells the configuration script what sort of
|
|
4 operating system this machine is likely to run.
|
|
5 USUAL-OPSYS="uxpv" */
|
|
6
|
|
7 #include "delta88k.h"
|
52401
|
8
|
|
9 /* arch-tag: a0ed4f18-ecf2-4d9a-853b-36e0f6b45945
|
|
10 (do not change this comment) */
|