Take the pain out of Git conflict resolution: use diff3blog.nilbus.com2 points·nilbus··0 commentsOpen articleSaveView on HN