Lukas Oberhuber wrote:
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,
Did you check the -m option for diff3?
Thanks
Vadim
_______________________________________________
Wengophone-devel mailing list
Wengophone-devel@lists.openwengo.com
http://dev.openwengo.com/mailman/listinfo/wengophone-devel
