]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'tc/merge-default-to-upstream-leakfix' into jch
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Jul 2026 17:40:44 +0000 (10:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jul 2026 17:40:44 +0000 (10:40 -0700)
commit9fc80c98a0d9bebcc899731fb3230f6e25f90d63
tree2e2c8ee6af029964339e1d458b814a27263f0875
parent182a8044cce8a869c48fbdaff18eb5f6f89c4b6d
parent68cce04a028cac13fa1fd7a368801fac3d8b156b
Merge branch 'tc/merge-default-to-upstream-leakfix' into jch

Leakfix.

* tc/merge-default-to-upstream-leakfix:
  merge: fix leak with merge.defaultToUpstream
builtin/merge.c
t/t7600-merge.sh