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
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
|
This is an archived mail posted to the TortoiseSVN Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.