Mercurial > emacs
view src/s/domain.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 | 8e1b437e5d04 |
children | 695cf19ef79e |
line wrap: on
line source
#include "bsd4-3.h" /* Inhibit using -X, which is the default. */ #define LD_SWITCH_SYSTEM