summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-04-08 11:59:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-08 11:59:46 -0700
commit48ae20513ddde38121cc89be58580a5970c813ef (patch)
tree86a9961b617c896f582e96e09db8f169721a62eb /git-mergetool--lib.sh
parentMerge branch 'jc/rev-parse-argh-dashed-multi-words' (diff)
parentMSVC: link in invalidcontinue.obj for better POSIX compatibility (diff)
downloadtgif-48ae20513ddde38121cc89be58580a5970c813ef.tar.xz
Merge branch 'mr/msvc-link-with-invalidcontinue'
* mr/msvc-link-with-invalidcontinue: MSVC: link in invalidcontinue.obj for better POSIX compatibility
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions