Https://www.sublimemerge.com/

Off Topic
1

https://www.sublimemerge.com/ – interesting merge tool was brought up in #kakoune.