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

Re: using an external diff

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2006-12-15 14:34:51 CET

On 12/14/06, Alex Goldsmith <alexg@rsp.com.au> wrote:

> We have a few hundred independent projects with a significant amount
> XML. It is important to be able to migrate changes between projects, and
> it seems like this should be possible with an intelligent diff.

The 'svn merge' command has a --diff3 switch, so you can make it use
an external diff3 program, presumably one which understands XML.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Dec 15 14:35:10 2006

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