Https://www.sublimemerge.com/


#1

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