summaryrefslogtreecommitdiff
path: root/t/t6417-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2022-03-17 10:57:43 +0100
committerLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2022-03-24 00:31:32 +0100
commit303b876f76c2caccc9a289c4f14a2b2d3850684e (patch)
tree1a7e38217fac02c6f9251b78e1cb4d74101f76c7 /t/t6417-merge-ours-theirs.sh
parentGIT-VERSION-GEN: bump to v2.33.1 (diff)
parentGit 2.32.1 (diff)
downloadtgif-303b876f76c2caccc9a289c4f14a2b2d3850684e.tar.xz
Sync with 2.32.1
* maint-2.32: Git 2.32.1 Git 2.31.2 Git 2.30.3 setup_git_directory(): add an owner check for the top-level directory Add a function to determine whether a path is owned by the current user
Diffstat (limited to 't/t6417-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions