Adam Downer wrote on Fri, May 06, 2011 at 11:33:06 +0100:
> This invokes the merge_cmd wrapper and passes a different set of args:
>
> /tmp/tempfile.3.tmp
> project/.svn/tmp/tempfile.tmp
> project/.svn/tmp/tempfile.3.tmp
> project/.svn/tmp/pom.xml.2.tmp
> project/pom.xml
>
> So now I am even
In an attempt to answer my own question I set my diff wrapper script to
simply echo the arguments passed to it into a txt file. I am aware that
in windows I only have access to the first nine args at a time. So I
echo args 1 - 9 and then shifted 9 times and echoed all 9 args again
(just to make sur
>
> If you just run 'kdiff3' from the shell prompt, do you get another
shell
> prompt before or after you close diff3?
>
> It should be the latter.
Good thought, it is the latter.
PLEASE NOTE THAT WE HAVE MOVED.
Our new a
Adam Downer wrote on Wed, May 04, 2011 at 12:34:47 +0100:
> Ahh yes, I should have mentioned that I have tried this change already.
> Oops.
> Removing the "--" parameters passing to diff3 performs a three-way diff
> of the files passed. I am after a three way merge, so this would be more
> like wh
Ahh yes, I should have mentioned that I have tried this change already.
Oops.
Removing the "--" parameters passing to diff3 performs a three-way diff
of the files passed. I am after a three way merge, so this would be more
like what I am needing to specify.
%DIFF3% %BASE% %MINE% %YOURS% -o %RESUL
On May 4, 2011, at 12:31 , Adam Downer wrote:
> Dear list,
>
> I am on windows and I am trying to use svn 1.6 on a cygwin command line to
> perform a merge of some code.
> I would also like to use the windows version of kdiff3 to help me out on this.
>
> I have read the book on this:
> http:
