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

Custom Merge/Diff

From: Tankko <tankko_at_gmail.com>
Date: 2006-08-25 21:26:55 CEST

I know this was talked about a year ago or so, but is there a way to
have a custom merge/diff tool that can be called based on .ext?

We have a custom file format that is not mergable as text, but can be
with our own tool.

One option is to create a .bat (or bash script on the Mac) that did
the checking and sent it to one or the other. I need something that
works seamlessly with TVSN and the command line without a lot of
complex custom set-up on the users machine.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 25 21:28:24 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.