Mercurial > emacs
view src/m/pyrmips.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
/* Configuration file for the Pyramid machine that uses the MIPS cpu. */ /* This does not fully work. */ #include "m-pyramid.h" #define SYSTEM_MALLOC #define CANNOT_DUMP /* arch-tag: 82559148-25a8-466d-bbb3-f903f7666b7a (do not change this comment) */