format diffs alongside text