summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-11-13 22:37:24 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-13 22:37:24 +0900
commit1961efecae1ef937aa1d571add4eae03a8c8303b (patch)
treec0701a8277680f3edcdf6efca5d8ff928cd0f6a1 /Documentation/git-mergetool--lib.txt
parentMerge branch 'js/rebase-p-tests' (diff)
parentpoll: use GetTickCount64() to avoid wrap-around issues (diff)
downloadtgif-1961efecae1ef937aa1d571add4eae03a8c8303b.tar.xz
Merge branch 'sh/mingw-safer-compat-poll'
Windows fix. * sh/mingw-safer-compat-poll: poll: use GetTickCount64() to avoid wrap-around issues
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions