Merge "Correct right border of binary header lines in side-by-side diffs"