Merge branch 'zj/diff-stat-smaller-num-columns'