Re: Resolving property conflicts
From: Ben Fritz <fritzophrenic_at_gmail.com>
Date: Wed, 21 Jan 2015 16:20:58 -0600
On Thu, Jan 15, 2015 at 1:25 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
Latest nightly gives a "edit conflict" button which invokes my external
After merging, I can "mark as resolved".
Perfect solution, thanks!
I've uninstalled the nightly for now (out of paranoia) so I'll eagerly
------------------------------------------------------
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.