Use p4merge or DiffMerge with git mergetool on OS Xblog.logicalrand.com1 point·cte··0 commentsOpen articleSaveView on HN