Hi, would it be possible to close the Edit Property Conflicts dialog and do what "Accept Merged" does when hitting "Mark as resolved" in a TortoiseMerge launched via "Edit" in the Edit Property Conflicts dialog?
That would be a lot more intuitive than choosing "save" in TortoiseMerge, close it and select "Accept Merged", especially since the Edit Property Conflicts dialog is a little bit confusing. Even the documentation suggests to use "Mark as resolved" after "Edit", although that discards(!) the incoming changes. I'd suggest renaming "Accept Merged" to "Mark as resolved" and to clarify the other options. I wouldn't remove the option currently named "Accept Merged" in favour of TMerge's "Mark as resolved" since it is needed when using a third party merge tool. By the way: Except for "Edit" all the other options in the Edit Property Conflicts dialog are missing a translation in the German language pack. Kind regards -- You received this message because you are subscribed to the Google Groups "TortoiseSVN-dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn-dev/8e78cf75-b8da-4eb2-8a25-6f15325767c3%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
