| commit | 2dc0b5588db6b83c99c97d561271227450fcc782 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 16 Oct 2011 19:57:10 +0000 (16 12:57 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 16 Oct 2011 19:57:10 +0000 (16 12:57 -0700) | ||
| tree | e68369a0db7ea120de2b556ed904d516e55fa97c | treesnapshot (tar.gz zip) |
| parent | 3e27de46185cbb092704444de69fe792761193df | commitdiff |
| parent | f64943d242d3b0fff40684d09033f17bb9747a38 | commitdiff |
Merge branch 'pt/mingw-misc-fixes' into next
* 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
* 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
| compat/mingw.c | diff1 | diff2 | blobhistory |
| git-svn.perl | diff1 | diff2 | blobhistory |