Mercurial > emacs
view src/s/bsdos2.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
/* s/ file for BSDI BSD/OS 2.0 system. */ #include "bsd386.h" #define TEXT_START 0x1020 /* for QMAGIC */ #define START_FILES pre-crt0.o /usr/lib/crt0.o #define HAVE_TERMIOS #define NO_TERMIO #undef KERNEL_FILE #define KERNEL_FILE "/bsd" /* arch-tag: 25ce1827-1511-4305-9058-24dd2118b5b4 (do not change this comment) */