pointing diff3-cmd to false.bat does not seem to work for me
From: Michael Toal <Michael.Toal_at_octec.co.uk>
Date: 2006-09-19 10:53:18 CEST
I have noticed that you periodically are asked how to force tortoisesvn
The stock answer seems to be:
Settings -> Subversion configuration file -> click the edit button
Change the [helpers] section by adding:-
diff3-cmd = "C:\false.bat"
Creating a C:\false.bat which contains only the following line:-
exit /B 1
I have a test repository which contains a text file
I check out this repository to two folders subtest1 and subtest2
I make a change to the text file in subtest1 folder and commit
I navigate to subtest2 and update
I expect a forced conflict and have to manually merge, but I get an
My understanding is that this is a client side setting, but if not
Thanks for the great program.
If I can sort this out, then that will help my argument for swapping
This is an archived mail posted to the TortoiseSVN Users mailing list.