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.
-- 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/12683722-0320-445e-93bb-1ab496215666%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
