tags:

views:

135

answers:

2

I have been trying to write my own diff3 wrap script for SVN and I am wondering what the various parameters that get passed to --diff3-cmd are.

The closest thing I could find so far is:

How can I use Beyond Compare 3 as the diff3-cmd for svn?

But it doesn't quite explain what all of the parameters do.

I also tried to pass it through this:

#!/bin/ksh
echo "$*"

as --diff3-cmd, and got some output, but I cant make heads or tails of the arguments it spit out. Are these the standard args for some unix diff command?

-E -m -L .working -L .merge-left.r1000 -L .merge-right.r1001 /home/user/some/long/filename1 /tmp/tmp /home/user/some/long/filename2
+2  A: 

Have you read the appropriate section in the SVN Book?

Milen A. Radev
Aha, apparently I missed this section. Thanks!
Mike Miller
A: 

Are these the standard args for some unix diff command?

Yes, these are parameters for GNU diff3. It's covered in the svn book.

Wim Coenen