On Tue, 30 May 2006, Francisco Vila wrote:
Also, after a '$ cvs co' my local copy has strange '<<<<<<'- and
'>>>>>'-filled lines surrounding some of my changes, don't know if
they have been applied or not. So I really don't know how to obtain a
second patch from this.
See:
http://www.tigris.org/nonav/scdocs/ddCVS_cvscontributing.html#cvsresolving
However, this should not happen with "cvs co". At least in the HEAD of
the 2.9 branch, I can not see an unresolved conflict.
Greetings,
Juergen
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel
