summaryrefslogtreecommitdiff
path: root/t/t6427-diff3-conflict-markers.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-02-05 16:31:26 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-02-05 16:31:26 -0800
commit8ff9ec4be60f8cc6f1a6a79ad43700bdd60a8d88 (patch)
tree27d99a0c69013f692973480675913647bd5ce605 /t/t6427-diff3-conflict-markers.sh
parentMerge branch 'tb/local-clone-race-doc' into maint (diff)
parentci/install-depends: attempt to fix "brew cask" stuff (diff)
downloadtgif-8ff9ec4be60f8cc6f1a6a79ad43700bdd60a8d88.tar.xz
Merge branch 'jc/macos-install-dependencies-fix' into maint
Fix for procedure to building CI test environment for mac. * jc/macos-install-dependencies-fix: ci/install-depends: attempt to fix "brew cask" stuff
Diffstat (limited to 't/t6427-diff3-conflict-markers.sh')
0 files changed, 0 insertions, 0 deletions