view src/param.h @ 87739:28dc34f6a246

* vc.el (vc-update): Resolve conflicts if necessary instead of just updating the buffer. * vc-cvs.el (vc-cvs-merge-news): Ignore the error status of the update command so that we can parse the output.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sun, 13 Jan 2008 20:03:35 +0000
parents 695cf19ef79e
children 375f2633d815
line wrap: on
line source

/* This is so that Emacs can run on VMS... */
#define EXEC_PAGESIZE 512

/* arch-tag: a6daea28-33a6-4dd3-97d8-5ee1a12f09d3
   (do not change this comment) */