summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-07-27 13:00:25 -0700
committerJunio C Hamano <gitster@pobox.com>2022-07-27 13:00:26 -0700
commitc896716d7725c1098940898c13aa1e65337c2a92 (patch)
tree3876cec14c0d472bf49bd3aa1a8b03bf81d0e903 /mergetools/vimdiff
parentbbea4dcf42b28eb7ce64a6306cdde875ae5d09ca (diff)
parent7253f7ca9fdc5a19f2a9ee5867a20182e10551d6 (diff)
Merge branch 'js/ci-github-workflow-markup' into maint
A fix for a regression in test framework. source: <pull.1288.git.1657789234416.gitgitgadget@gmail.com> * js/ci-github-workflow-markup: tests: fix incorrect --write-junit-xml code
Diffstat (limited to 'mergetools/vimdiff')
0 files changed, 0 insertions, 0 deletions