Merge branch 'pt/mingw-misc-fixes'
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Oct 2011 04:59:11 +0000 (21:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Oct 2011 04:59:11 +0000 (21:59 -0700)
* pt/mingw-misc-fixes:
t9901: fix line-ending dependency on windows
mingw: ensure sockets are initialized before calling gethostname
mergetools: use the correct tool for Beyond Compare 3 on Windows
t9300: do not run --cat-blob-fd related tests on MinGW
git-svn: On MSYS, escape and quote SVN_SSH also if set by the user
t9001: do not fail only due to CR/LF issues
t1020: disable the pwd test on MinGW

1  2 
compat/mingw.c
git-svn.perl
diff --cc compat/mingw.c
Simple merge
diff --cc git-svn.perl
Simple merge