http: enable keepalive on TCP sockets
[git] / builtin / merge-ours.c
2010-02-22  Linus TorvaldsMove 'builtin-*' into a 'builtin/' subdirectory