On Tuesday, July 31, 2018 at 11:02:02 AM UTC+2, (unknown) wrote: > > 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? >
would be possible. But what about those who don't have TMerge configured to resolve conflicts? > 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. > > those strings are not provided by TSVN but by the svn library. And the translations there are way behind... Stefan -- 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/eb5d8517-edd5-4f6c-a5a8-09760fce6dbc%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
