Add diff strategy for ruby and summary for merges