Mercurial > emacs
view src/s/bsdos2-1.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 | f7b797ba1874 |
children | 695cf19ef79e |
line wrap: on
line source
/* s/ file for BSDI BSD/OS 2.1 system. */ #include "bsdos2.h" #undef LIB_X11_LIB #define LIB_X11_LIB -L/usr/X11/lib -lX11 -lipc