[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Updated merge script for Word 2010

From: Richard Horton <Richard.Horton_at_Fidelitylife.co.nz>
Date: Fri, 4 Nov 2011 10:37:05 +1300

I have spent some time updating this, and improving the 3 way merge for conflict resolution which in my opinion wasn't working right (though that may have been as I am using 2010). I now send it to you as it may be of value and save somebody a little time.

If you have problems with mail blocking, let me know how you want it sent.

Richard Horton
Chief Information Officer
P: 09 300 6639 | M: 021 796277
[cid:image001.gif@01CC9ADC.C6B58810] www.fidelitylife.co.nz<http://www.fidelitylife.co.nz/>
Innovative insurance and investment products specifically designed for New Zealanders
Street address: Fidelity House, 81 Carlton Gore Road, Newmarket, Auckland
Postal address: P.O. Box 37-275, Parnell, Auckland, 1151
This message and any attachments are only intended to be read by the named recipient. It may contain information which is
confidential, proprietary or the subject of legal privilege. If you are not the intended recipient you must delete this e-mail and
may not use any information contained in it, nor peruse, use, disseminate, distribute or copy this email or attachments. Legal
privilege is not waived because you have read this e-mail. An Investment Statement is available on request free of charge.
Thank you.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2872557

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

image001.gif
Received on 2011-11-03 22:40:00 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.