summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-02-11 16:56:01 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-11 16:56:01 -0800
commit9210a00d65fca884d2ecdcab32b917a672079014 (patch)
tree56189a1b5a8e409e3bab346074f2b180f24ccb9d /Documentation/git-merge.txt
parentMerge branch 'rc/negotiate-only-typofix' (diff)
parentsparse-checkout: fix a couple minor memory leaks (diff)
downloadtgif-9210a00d65fca884d2ecdcab32b917a672079014.tar.xz
Merge branch 'en/sparse-checkout-leakfix'
Leakfix. * en/sparse-checkout-leakfix: sparse-checkout: fix a couple minor memory leaks
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions