TortoiseMerge goes mad

Hi,

Just tried 'diffing' my lastest code and TortoiseMerge hits 99% CPU and sits there.

Tried WinMerge on my file and the one in .svn to produce the attached patch file. Any clues ?

I have the very latest TSVN from last night, and have rebooted.

Scott Pritchett
---------------------------------------------------------------------------------------------
This email and any files transmitted with it are confidential and
intended solely for the use of the individual or entity to whom
they are addressed.

If you have received this email in error please notify the
originator of the message. This footer also confirms that this
email message has been scanned for the presence of computer viruses.

Any views expressed in this message are those of the individual
sender, except where the sender specifies and with authority,
states them to be the views of Amtrak Express Parcels Limited.

Scanning of this message and addition of this footer is performed
by SurfControl E-mail Filter software in conjunction with
virus detection software.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org