diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-12-27 00:11:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-27 00:11:46 -0800 |
| commit | 58fcd54853023b28a44016c06bd84fc91d2556ed (patch) | |
| tree | 7028122f2f83c8347ff8dcab6df8001be36c82a8 /mergetools/tortoisemerge | |
| parent | Merge branch 'ls/p4-lfs' (diff) | |
| parent | mingw: replace isatty() hack (diff) | |
| download | tgif-58fcd54853023b28a44016c06bd84fc91d2556ed.tar.xz | |
Merge branch 'js/mingw-isatty'
Update the isatty() emulation for Windows by updating the previous
hack that depended on internals of (older) MSVC runtime.
* js/mingw-isatty:
mingw: replace isatty() hack
mingw: fix colourization on Cygwin pseudo terminals
mingw: adjust is_console() to work with stdin
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions