Subj : binkit error
To   : DIGITAL MAN
From : Dumas Walker
Date : Sun Dec 01 2019 10:12 am

>Those are merge-conflict markers. Simply deleting the version you have locally
>nd getting again via CVS will fix that.

Ahh, I have seen those pop up in menu files before too and wondered how
they got there!  :)

> "cvs update -C" would also work.

So that will cause the new version to overwrite rather than merge?

Thanks!


* SLMR 2.1a * The best way to accelerate a Mac is at -32.2 ft/s™.

---
� Synchronet � CAPCITY2 * capcity2.synchro.net * Telnet/SSH:2022/Rlogin/HTTP

You are viewing proxied material from bbs.kd3.us. The copyright of proxied material belongs to its original authors. Any comments or complaints in relation to proxied material should be directed to the original authors of the content concerned. Please see the disclaimer for more details.