summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff2
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-08-09 15:49:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-08-09 15:49:55 -0700
commit96cb27a9d2db3c01b8e296a0fbc1da1da09d1412 (patch)
treebd1025351e85a9d5f2d7776ada9404051d657475 /mergetools/vimdiff2
parentMerge branch 'master' of git://github.com/git-l10n/git-po (diff)
parentparse-options: fix clang opterror() -Wunused-value warning (diff)
downloadtgif-96cb27a9d2db3c01b8e296a0fbc1da1da09d1412.tar.xz
Merge branch 'maint'
* maint: parse-options: fix clang opterror() -Wunused-value warning
Diffstat (limited to 'mergetools/vimdiff2')
0 files changed, 0 insertions, 0 deletions