|
Neohapsis is currently accepting applications for employment. For more information, please visit our website www.neohapsis.com or email hr@neohapsis.com |
CVS: cvs.openbsd.org: src
From: Tobias Stoeckmann (tobias
cvs.openbsd.org)
Date: Mon Jun 09 2008 - 17:31:25 CDT
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
CVSROOT: /cvs
Module name: src
Changes by: tobiascvs.openbsd.org 2008/06/09 16:31:24
Modified files:
usr.bin/cvs : commit.c entries.c file.c update.c
Log message:
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.
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]