ParentFull threadactivitypea·Sublime Merge was pretty alright, don't know if it's still aroundView on HN