X-Authentication-Warning: delorie.com: mail set sender to djgpp-bounces using -f
Message-ID: <BAYC1-PASMTP01BD9CB1C303DECDCDBFBDEF800@CEZ.ICE>
X-Originating-IP: [65.95.199.84]
X-Originating-Email: [april_white AT sympatico DOT ca]
Message-ID: <449469CB.8040103@sympatico.ca>
Date: Sat, 17 Jun 2006 16:44:59 -0400
From: April White <april_white AT sympatico DOT ca>
User-Agent: Thunderbird 1.5.0.4 (Windows/20060516)
MIME-Version: 1.0
To: djgpp AT delorie DOT com
Subject: Re: cvs failed to merge two files
References: <BAYC1-PASMTP04FED050291CC5C417D7B2EF800 AT CEZ DOT ICE>
In-Reply-To: <BAYC1-PASMTP04FED050291CC5C417D7B2EF800@CEZ.ICE>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-OriginalArrivalTime: 17 Jun 2006 20:45:00.0044 (UTC) FILETIME=[E697A4C0:01C6924E]
Reply-To: djgpp AT delorie DOT com

April White wrote:
> Last weekend I received some messages from cvs that some files could 
> not be successfully merged, so I downloaded the source tree and 
> overwrote my existing copy.
oops, wrong mailing list address, please disregard

April
-- 

Press any key to continue or any other key to quit...