Mercurial > emacs
view src/s/uxpv.h @ 47780:27caec378c23
(vc-maybe-resolve-conflicts): Always call vc-resolve-conflicts
in case some other package redefined it.
(vc-resolve-conflicts): Make it into an alias for smerge-ediff.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 07 Oct 2002 16:24:42 +0000 |
parents | e075b0cbd57a |
children | 695cf19ef79e |
line wrap: on
line source
/* System description file for Fujitsu UXP/V This file describes the parameters that system description files should define or not. */ #include "usg5-4-2.h" /* SYSTEM_TYPE should indicate the kind of system you are using. It sets the Lisp variable system-type. */ #undef SYSTEM_TYPE #define SYSTEM_TYPE "uxpv"