Re: HEAD website projects.html,1.307,1.308

From: <>
Date: Tue, 20 Mar 2007 11:57:00 +1200 (NZST)

> Hmm... I assume this was not intentional.
> What happened?
> Regards
> Henrik

I went:
  cvs -q update
  cvs commit
without noticing that the update had created a merge-clash patch for the
changes you had made.
When I found the .# patch file with your updates I checked and merged my
update into that and replace the bad one temporarily committed.

Why there was a merge-clash on every 'changesets' alteration in the first
place I still don't know. The only real clash was both of us altering the
squid3-ipv6 'view patch' line.

Received on Mon Mar 19 2007 - 17:58:11 MDT

This archive was generated by hypermail pre-2.1.9 : Sun Apr 01 2007 - 12:00:01 MDT