[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Enable use of internal diff when performing merge

From: <rooneg_at_electricjellyfish.net>
Date: 2003-01-27 03:47:06 CET

On Sunday, January 26, 2003, at 09:15 PM, Sander Striker wrote:

 Hi,

 This is a rough implementation of replacing the external
 diff3 call with our own merge code. In hand testing it
 works.

 Anyone have a problem with me committing this on a branch?

+1

hell, if you can get 'make check' to pass, i'd be in favor of
committing it strait out so we can get rid of gnu diff/diff3 asap.
then again, i don't tend to use any of the odd options for gnu diff
that your stuff doesn't support, so i'm biased.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 14 02:18:50 2006

This is an archived mail posted to the Subversion Dev mailing list.