summaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2021-02-12 15:51:12 +0100
committerLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2021-02-12 15:51:12 +0100
commite4e68081bb811672b069eb1d6c97e57dd0764d51 (patch)
treeac9c0610ed0f5dad5cfe6b197080c460822a6040 /mergetools/tortoisemerge
parentMerge branch 'tb/ci-run-cocci-with-18.04' into maint (diff)
parentGit 2.29.3 (diff)
downloadtgif-e4e68081bb811672b069eb1d6c97e57dd0764d51.tar.xz
Sync with 2.29.3
* maint-2.29: Git 2.29.3 Git 2.28.1 Git 2.27.1 Git 2.26.3 Git 2.25.5 Git 2.24.4 Git 2.23.4 Git 2.22.5 Git 2.21.4 Git 2.20.5 Git 2.19.6 Git 2.18.5 Git 2.17.6 unpack_trees(): start with a fresh lstat cache run-command: invalidate lstat cache after a command finished checkout: fix bug that makes checkout follow symlinks in leading path
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions