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