Mergetools: Stop doing three-way mergeseseth.org2 points·osener··0 commentsOpen articleSaveView on HN