You are viewing a plain text version of this content. The canonical link for it is here.

Posted to users@subversion.apache.org by kf...@collab.net on 2005/03/02 16:26:15 UTC

Re: SVN and Centura Team Developer

"Dobler, Michael" <M....@KUEBA.ch> writes:
> we are just starting using SVN with Centura/Gupta Team Developer
> 3.1. But we have one problem. SVN adds conflict markers like "<<<<<"
> to the source code but the Team Developer IDE cannot process this
> line and errors occur while opening. Is there a way to configure the
> marker characters so we could add a leading "!" to the marker to
> tell GUPTA that it's a comment line?

The conflict marker symbols are not configurable, but you could use a
different diff3 program by using the --diff3-cmd option.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org