Switch from diff_add_step_*_of_2 to diff_add while debugging