summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2020-04-19 16:30:27 -0700
committerLibravatar Jonathan Nieder <jrnieder@gmail.com>2020-04-19 16:30:27 -0700
commitf2771efd07b51edae023db95fcca39c72a0397fe (patch)
tree1c2cf45ae40c5e662d5f9277b63b78bb7ef9c420 /Documentation/git-mergetool--lib.txt
parentGit 2.23.2 (diff)
parentGit 2.22.4 (diff)
downloadtgif-f2771efd07b51edae023db95fcca39c72a0397fe.tar.xz
Git 2.23.3
This merges up the security fix from v2.17.5. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions