Merge branch 'js/mingw-isatty' into maint
commit6a7e25d155adb2c8a44173ec80fac7b0385a55a7
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:11 +0000 (31 13:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:11 +0000 (31 13:32 -0800)
tree0bb9ed6a493f31ab6499ccad2923ccca719d0457
parent63f1bb8109b76edd150340b1dfca98cd7a029d5d
parent1d3f065e0e4090a78640642cc1c1a3ce91d7852a
Merge branch 'js/mingw-isatty' into maint

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

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