Merge branch 'jc/diff-from-contents-fix' into ly/diff-name-only-with-diff-from-content

* jc/diff-from-contents-fix: diff: make sure the other caller of diff_flush_patch_quietly() is silent