>> 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?
> would be possible. But what about those who don't have > TMerge configured to resolve conflicts? They keep using "Accept Merged" in the Edit Property Conflicts dialog. I tried to suggest to make the "Mark as resolved" button in TMerge operational in this case: It should mark the conflict as resolved and close the Edit Property Conflicts dialog afterwards. I'm using KDiff3 myself and found this inconsistency while trying to resolve a conflict with TMerge instead because the misleading label texts from the svn library kept me losing changes. -- 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/95058cad-db5e-4894-8a11-a72ae7c0f3d5%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
