ParentFull threadguitarbill·doesn't most three-way merge software have that UI? like kdiff3, meld, sublime merge, p4merge, vimdiff et al. (even think jetbrains products have it)View on HN