From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 Oct 2011 04:59:11 +0000 (-0700)
Subject: Merge branch 'pt/mingw-misc-fixes'
X-Git-Tag: v1.7.8-rc0~46
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=578183bcb0fd30b7a36b98b714de96220793e712;p=git.git

Merge branch 'pt/mingw-misc-fixes'

* 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
---

578183bcb0fd30b7a36b98b714de96220793e712