]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/diff-from-contents-fix' into ly/diff-name-only-with-diff-from-content
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Oct 2025 16:06:29 +0000 (09:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Oct 2025 16:06:29 +0000 (09:06 -0700)
* jc/diff-from-contents-fix:
  diff: make sure the other caller of diff_flush_patch_quietly() is silent

1  2 
diff.c

diff --cc diff.c
Simple merge