summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2020-04-19 16:30:19 -0700
committerLibravatar Jonathan Nieder <jrnieder@gmail.com>2020-04-19 16:30:19 -0700
commitc9808fa014aa88cc306705d308d1d9065d567ddc (patch)
tree49e1802baf85a3b95796f457739d51f242c41f3d /Documentation/git-mergetool--lib.txt
parentGit 2.22.3 (diff)
parentGit 2.21.3 (diff)
downloadtgif-c9808fa014aa88cc306705d308d1d9065d567ddc.tar.xz
Git 2.22.4
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