how to solve doc / docx files in conflict ?
From: MagicFX <magicfx0413_at_gmail.com>
Date: Wed, 23 Jul 2008 02:22:12 -0700 (PDT)
the default diff / merge editor cannot parse ms word format
---------------------------------------------------------------------
|
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.