Merge branch 'js/mingw-isatty'
commitd515fe08fc188ed5a23537a8218a32caf716ff49
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:14:58 +0000 (31 13:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:14:58 +0000 (31 13:14 -0800)
treecc6b003b3920b73a8810698cc0dd3ebb6ec49140
parent307de75c4893daa53895db26d389dc6f5e07c2c6
parent1d3f065e0e4090a78640642cc1c1a3ce91d7852a
Merge branch 'js/mingw-isatty'

An update to a topic that is already in 'master'.

* js/mingw-isatty:
  mingw: follow-up to "replace isatty() hack"
compat/winansi.c