Vadim,
Unless I don't understand options correctly, diff only takes 2 file args so
can't do 3 way merges (another feature I unfortunately need) and diff3
doesn't allow for -w option. Sigh.
Here's what eclipse svn wants to pass to tortoisemerge:
/theirs:"${theirs}" /base:"${base}" /mine:"${yours}" /merged:"${merged}"
Any other ideas (very welcomed I must add)?
-Lukas
Lukas Oberhuber
-----Original Message-----
From: Vadim Lebedev [mailto:[EMAIL PROTECTED]
Sent: 19 October 2006 15:58
To: Lukas Oberhuber; OpenWengo
Subject: Re: [Wengophone-devel] branches and wifo-refactoring
Lukas Oberhuber wrote:
>Vadim,
>
>I've searched high and low on windows for a command line differ that will
>ignore whitespace or even just EOL, so that I can call it from tortoisesvn
>or subclipse. No luck. I've given up.
>
>
how about diff from http://unxutils.sourceforge.net/
Thanks
Vadim
_______________________________________________
Wengophone-devel mailing list
[email protected]
http://dev.openwengo.com/mailman/listinfo/wengophone-devel
