Error with merging
From: <pll_at_lanminds.com>
Date: 2003-02-07 21:17:17 CET
Hi all,
I updated some files in my subversion source tree. I then went to do
/usr/bin/diff3: unrecognized option `--diff-program=/usr/bin/diff'
Presumably, because what I had in my wc and what were in HEAD
I've even tried to delete my local copies, svn revert those files,
Any ideas?
I'm running Debian Linux with the most recent .deb of subversion:
$ svn --version
Copyright (C) 2000-2003 CollabNet.
The following repository access (RA) modules are available:
* ra_dav : Module for accessing a repository via WebDAV (DeltaV) protocol.
Thanks!
-- Seeya, Paul -- Key fingerprint = 1660 FECC 5D21 D286 F853 E808 BB07 9239 53F1 28EE It may look like I'm just sitting here doing nothing, but I'm really actively waiting for all my problems to go away. If you're not having fun, you're not doing it right! --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org For additional commands, e-mail: dev-help@subversion.tigris.orgReceived on Fri Feb 7 21:18:00 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.