summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-30 15:43:48 +0900
committerJunio C Hamano <gitster@pobox.com>2018-10-30 15:43:48 +0900
commit97ffca6cc74e5313a7d503f76fe2a99f13750c69 (patch)
tree905381a7a4b8a3b2c49a3b0781adaa58808a8109 /Documentation/git-mergetool.txt
parentcc6748720f9014b2c2cea8a603acd9ff6a62b87c (diff)
parentc6f050a4349339f812cdc3131ce104057424f492 (diff)
downloadgit-97ffca6cc74e5313a7d503f76fe2a99f13750c69.tar.gz
Merge branch 'js/mingw-load-sys-dll'
The way DLLs are loaded on the Windows port has been improved. * js/mingw-load-sys-dll: mingw: load system libraries the recommended way
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions