Merge branch 'il/remote-fd-ext'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 19:24:14 +0000 (11:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 19:24:14 +0000 (11:24 -0800)
* il/remote-fd-ext:
  remote-fd/ext: finishing touches after code review
  git-remote-ext
  git-remote-fd
  Add bidirectional_transfer_loop()

Conflicts:
compat/mingw.h

1  2 
Makefile
builtin.h
compat/mingw.h
git.c

diff --cc Makefile
Simple merge
diff --cc builtin.h
Simple merge
diff --cc compat/mingw.h
Simple merge
diff --cc git.c
Simple merge