Re: Merge problems.
From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-02-04 17:56:21 CET
Leandro Lucarella <llucar@mecon.gov.ar> writes:
> $ svn merge -r21:22 ../proto
It looks like your Subversion is expecting a 2.8 style GNU diff but is
diff3-has-program-arg = false
in your ~/.subversion/config
-- Philip Martin --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org For additional commands, e-mail: dev-help@subversion.tigris.orgReceived on Tue Feb 4 18:23:51 2003 |
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.