Subj : CVS commit exec/gnats_cvs To : Deuce From : Digital Man Date : Thu Aug 04 2005 01:01 pm Re: CVS commit exec/gnats_cvs By: Deuce to Digital Man on Thu Aug 04 2005 01:51 pm > Re: CVS commit exec/gnats_cvs > By: Digital Man to deuce on Thu Aug 04 2005 11:10:00 > > > It looks like you hand-edited the copy of this file on vert? When I attem > > "cvs update", it tried to merge and had conflicts (?). > > Hrm... if I did, it was an accident (whoops) My mistake, it was the whole Win32 vs. *nix line-ending problem. CVS's diff/merge doesn't ignore line-endings. digital man Snapple "Real Fact" #3: Beavers can hold their breathe for 45 minutes under water. .