summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-02-25 15:47:36 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-25 15:47:36 -0800
commit362f869ff2dbc389234ecd8c4b996a9e507c39d7 (patch)
tree077586c50787e0a4469311aa15e7059f731825c5 /Documentation/git-merge-file.txt
parentMerge branch 'ab/date-mode-release' (diff)
parentdiff.[ch]: have diff_free() free options->parseopts (diff)
downloadtgif-362f869ff2dbc389234ecd8c4b996a9e507c39d7.tar.xz
Merge branch 'ab/diff-free-more'
Leakfixes. * ab/diff-free-more: diff.[ch]: have diff_free() free options->parseopts diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec)
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions