summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-10-18 11:40:47 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-18 11:40:47 +0900
commit2d74d28ee0d8cddd6014a2b44eb2d7d6c4c0e1dd (patch)
tree41ba3a892f8ebaa5aeae22a626c56654ce305511 /Documentation/git-mergetool--lib.txt
parentMerge branch 'ta/t1308-typofix' (diff)
parentpthread.h: manually align parameter lists (diff)
downloadtgif-2d74d28ee0d8cddd6014a2b44eb2d7d6c4c0e1dd.tar.xz
Merge branch 'dl/compat-cleanup'
Code formatting micronit fix. * dl/compat-cleanup: pthread.h: manually align parameter lists
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions