Neohapsis is currently accepting applications for employment. For more information, please visit our website www.neohapsis.com or email firstname.lastname@example.org
From: Tobias Stoeckmann (tobiascvs.openbsd.org)
Date: Mon Jun 09 2008 - 17:31:25 CDT
Module name: src
Changes by: tobiascvs.openbsd.org 2008/06/09 16:31:24
usr.bin/cvs : commit.c entries.c file.c update.c
Properly handle merged files and conflicts which may arrise while merge.
Instead of ignoring all files which contain possible conflict markers,
only watch out for files which have actually been merged.
With input by and ok joris.