Re: Suggestion: include command lines for some common third-partymerge tools

Simon Large wrote:
>>I'm still trying to find the command-line to use WinMerge as the merge
>>tool. I've asked twice on this list and never got any responses.
>
>
> According to WinMerge help, it seems that bog standard WinMerge does not
> do the 3 way diff with merge output, which is what is required for
> resolving conflicts. You need Perforce WinMerge for that, and the
> commandline for P4WinMerge is already in the TSVN helpfile.

Ok, thanks.

-- 
Sly
This message and its attachments may contain legally privileged or confidential information. This message is intended for the use of the individual or entity to which it is addressed. If you are not the addressee indicated in this message, or the employee or agent responsible for delivering the message to the intended recipient, you may not copy or deliver this message or its attachments to anyone. Rather, you should permanently delete this message and its attachments and kindly notify the sender by reply e-mail. Any content of this message and its attachments, which does not relate to the official business of the sending company must be taken not to have been sent or endorsed by the sending company or any of its related entities. No warranty is made that the e-mail or attachment(s) are free from computer virus or other defect.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org