[3.15] gh-154085: Avoid duplicating diff line values (GH-154099)

[3.15] gh-154085: Avoid duplicating diff line values (GH-154099) #130504