summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-05-24 19:39:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-05-24 19:39:38 -0700
commitf37d9598789af3964ed37b855fabbfab84088bc2 (patch)
tree8343461288f530b1678580d20226ed495069174e /Documentation/git-mergetool--lib.txt
parentMerge branch 'dl/merge-autostash' (diff)
parentt4216: avoid unnecessary subshell in test_bloom_filters_not_used (diff)
downloadtgif-f37d9598789af3964ed37b855fabbfab84088bc2.tar.xz
Merge branch 'gs/commit-graph-path-filter'
Test fix. * gs/commit-graph-path-filter: t4216: avoid unnecessary subshell in test_bloom_filters_not_used
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions