Eliminate horizontal shifting on diff body heights

王权利请求将github/fork/tjk/patch-1合并到master

Created by: tjk

合并请求报告