Add new 3-way merge to Elektrad

[raphi011]

Always merge with 'ours'

[markus2330]

As discussed with @raphi011 this will be done in December.

@Chemin1 the PR is not merged yet, so it is not yet an existing tool. So nothing to be done by you now.

[stale]

I mark this issue stale as it did not have any activity for one year. I'll close it in two weeks if no further activity occurs. If you want it to be alive again, ping the issue by writing a message here or create a new issue with the remainder of this issue.
Thank you for your contributions 💖

[stale]

I closed this issue now because it has been inactive for more than one year. If I closed it by mistake, please do not hesitate to reopen it or create a new issue with the remainder of this issue.
Thank you for your contributions 💖