How to disable automatic merging...

This is my first post to the list.

I find it incredible that such a thing as automatic merging even
exists. SVN is writing code for you! Be that as it may, how can I
prevent automatic merging?

I hunted around for this topic on the web and found someone's
suggestion to add the following to the ~/.subversion/config file:
diff-cmd=/usr/bin/false
diff3-cmd=/usr/bin/false

but alas this doesn't work. I still get the dreaded "G" tag when
updating. I have a feeling that somehow the config file is being
ignored as changing the "editor-cmd" value didn't change anything
either...

Please help if you can. Thanks!
-GH

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 10 20:02:51 2007