We\'re looking at moving from a check-out/edit/check-in style of version control system to Subversion, and during the evaluation we discovered that when you perform an Update ac
It's in the FAQ: How can I prevent Subversion from doing automatic merges?
- In TortoiseSVN->Settings->General->Subversion configuration file, click on the edit button.
Change the
[helpers]
section by addingdiff-cmd = "C:\\false.bat"
(note the double backslash)
Create the file C:\false.bat which contains two lines
@type %9 @exit 1