summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-03-21 11:30:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-03-21 11:30:14 -0700
commit4c5dbf1c142e8fd8a58af461412a10d511eb4691 (patch)
treee9aa7cec0b6d8fc328b91ecb77573516ece2b495 /t/t7610-mergetool.sh
parentMerge branch 'dp/merge-strategy-doc-fix' (diff)
parentmingw: abort on invalid strftime formats (diff)
downloadtgif-4c5dbf1c142e8fd8a58af461412a10d511eb4691.tar.xz
Merge branch 'js/ming-strftime'
* js/ming-strftime: mingw: abort on invalid strftime formats
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions