Merge branch 'ly/diff-name-only-with-diff-from-content'

Regression fixes for a topic that has already been merged. * ly/diff-name-only-with-diff-from-content: diff: stop output garbled message in dry run mode