Use TortoiseMerge to compare the Unit1.sd to Unit2.sd, which believe are
UTF-16 encoded, with a BOM.
This works with WinMerge and Beyond Compare, for example.
The application crashes and Windows XP generates a crash report.
Upon comparing Utils1.sd to utils2.sd, there is a message box:
---------------------------
TortoiseMerge
---------------------------
Cannot show diff because of inconsistent newlines in the file.
---------------------------
OK
---------------------------
Hope this helps,
Patrick
====================================================
Patrick Martin
EMB Consultancy LLP
Saddlers Court, 64-74 East Street, Epsom, Surrey KT17 1HB, UK
Tel: + 44 (0) 1372 751060 Fax: +44 (0) 1372 751061
Email: Patrick.Martin@emb.co.uk URL: www.emb.co.uk
====================================================
EMB Consultancy LLP registered in England and Wales
Partnership No. OC307392
----------------------------------------------------------------------
This e-mail message (and any associated files) is confidential and may
contain legally privileged information. If you are not the intended
recipient you are hereby notified that any dissemination, copying,
distribution or other use of the information in this e-mail is
strictly prohibited.
Please also telephone (+44 (0) 1372 751060) or fax (+44 (0) 1372
751061) us immediately and delete the message from your system. E-mail
may be susceptible to data corruption, interception and unauthorised
amendment, and we do not accept liability for any such corruption,
interception or amendment or the consequences thereof or your reliance
on any information contained therein if you are not the intended
recipient. Any views or opinions presented are solely those of the
author and do not necessarily represent those of EMB.
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
- application/octet-stream attachment: Unit1.sd
- application/octet-stream attachment: Unit2.sd
- application/octet-stream attachment: Utils1.sd
- application/octet-stream attachment: Utils2.sd
Received on Mon Aug 14 15:58:27 2006