Neohapsis is currently accepting applications for employment. For more information, please visit our website www.neohapsis.com or email firstname.lastname@example.org
CVS: cvs.openbsd.org: src
From: Joris Vink (joriscvs.openbsd.org)
Date: Sun Jul 02 2006 - 16:01:48 CDT
Module name: src
Changes by: joriscvs.openbsd.org 2006/07/02 15:01:48
usr.bin/cvs : commit.c update.c
- abort the commit when files are not correctly up to date.
- do not try to attempt to check for conflict markers when the file is not on disk.
found by and okay reyk