Re: Disabling automatic conflict resolution?

james-tigris@jrv.org writes:

> Is there a way to disable automatic conflict resolution, so that all
> conflicts require manual intervention?

You can use diff3-cmd in ~/.subversion/config (or --diff3-cmd from the
command line) to cause Subversion to use an external program rather
than the internal merge. The external program can do whatever you
want it to, including simply saving the three files without attempting
a merge.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org