diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-12-15 09:42:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-15 09:42:01 -0800 |
| commit | de301c5c85b333751a21b3d6b8cff566dc31e6c9 (patch) | |
| tree | 05be77a4c0a57220506738d04d03699e2c7f76f4 /t/t7610-mergetool.sh | |
| parent | Merge branch 'ls/p4-keep-empty-commits' into maint (diff) | |
| parent | ident: fix undefined variable when NO_IPV6 is set (diff) | |
| download | tgif-de301c5c85b333751a21b3d6b8cff566dc31e6c9.tar.xz | |
Merge branch 'ep/ident-with-getaddrinfo' into maint
A fix-up for recent topic.
* ep/ident-with-getaddrinfo:
ident: fix undefined variable when NO_IPV6 is set
ident.c: add support for IPv6
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions