'diff-cmd' and 'diff3-cmd' in config file
Posted: Mon Oct 27, 2008 4:40 pm
Hello
Basicly, I am trying to force all merged files into a conflicted state.
This works fine with eg. tortoiseSVN if you follow these simple steps found here:
http://tortoisesvn.net/node/241
Our team as a whole has chosen to use syncro.
My question is whrether syncro SVN client (v. 4.0) uses these settings in the config file or just ignores them (as it seems to me) ?
And,
If you know of a workaround to force the changed files into a conflicted state during a merge.
Thank you.
fantomet
Basicly, I am trying to force all merged files into a conflicted state.
This works fine with eg. tortoiseSVN if you follow these simple steps found here:
http://tortoisesvn.net/node/241
Our team as a whole has chosen to use syncro.
My question is whrether syncro SVN client (v. 4.0) uses these settings in the config file or just ignores them (as it seems to me) ?
And,
If you know of a workaround to force the changed files into a conflicted state during a merge.
Thank you.
fantomet