httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Brian Havard" <bri...@kheldar.apana.org.au>
Subject Re: Anon CVS problem
Date Mon, 27 Oct 1997 16:56:30 GMT
On Mon, 27 Oct 1997 08:43:30 -0700 (MST), Marc Slemko wrote:

>Should be fixed.

Well, now I get a different error:

RCS file: /cvs/apachen/src/main/http_core.c,v
retrieving revision 1.132
retrieving revision 1.133
Merging differences between 1.132 and 1.133 into http_core.c
/usr/bin/diff3: not found
cvs server: could not merge revision 1.132 of http_core.c
cvs server: restoring http_core.c from backup file .#http_core.c.1.132

--
 ______________________________________________________________________________
 |  Brian Havard                 |  "He is not the messiah!                   |
 |  brianh@kheldar.apana.org.au  |  He's a very naughty boy!" - Life of Brian |
 ------------------------------------------------------------------------------


Mime
View raw message