Re: [TortoiseCVS] setting options for keywaord substitution on a merge

[Gerhard F. <li...@co...>]

Brocha Strous wrote:

> Is there a way to override the default settings for keyword substitution
> when doing a merge using the Tortoise GUI? By default the keywords are
> expanded and therefore keywords cause merge conflicts.

Right-click in the column "Keywords" in the Add dialog and select the
option(s) you want, for example Keywords > Disabled.

For help on what the individual options mean, see
<http://www.cvsnt.org/manual/html/Keyword-substitution.html>, especially
<http://www.cvsnt.org/manual/html/Substitution-modes.html>.

Gerhard