If you modify a template of a control procedure in two branches, this will result in a conflict during merging. Fortunately, you can easily start for example WINMerge from the SF to compare and adjust the differences.
If you add a template in both branches, this also creates a conflict. However, you cannot use the WINMerge button; it is grayed out.
Now I have to switch between the different branches to see the differences. My wish is that it would be possible to quickly start WINMerge even when adding a template in different branches.
