summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-10-03 13:24:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-03 13:24:18 -0700
commit6406bdc0b95715a087fdeeb0f6adf3deb80a25b8 (patch)
treeedb53cf935ff1f262854064fa0d782af953e0522 /mergetools
parentMerge branch 'jk/ident-ai-canonname-could-be-null' into maint (diff)
downloadtgif-6406bdc0b95715a087fdeeb0f6adf3deb80a25b8.tar.xz
Git 2.10.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions