Am Freitag, 8. Juni 2018 17:27:29 UTC+2 schrieb Stefan: > > it will get enabled as soon as you save the changes to the conflicted file. > When editing a conflict, four files are passed to the external tool: > "base", "your" and "theirs", and a file for where to save the result named > "merged". As soon as the "merged" file is saved, the button gets enabled. >
Unfortunately it did not. I am pretty sure I saved the file, but the button was no enabled. I have to say that I haven't done any changes to its content. The file was just marked conflicted because there had been changes in subsequent lines, but it was not a real conflict. I use BC4. I will double-check again in 3 weeks. -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" 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/e9a17c07-f6d4-4170-9925-5b488d70829e%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
