summaryrefslogtreecommitdiff
path: root/git-gui/lib/mergetool.tcl
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-06-06 14:27:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-06-06 14:27:38 -0700
commit1676827c859d838dc104a21f993af40d01586c0f (patch)
treed800c18674c1a17ca508d5c9b5213d67dacff33e /git-gui/lib/mergetool.tcl
parentMerge branch 'da/difftool' into maint (diff)
parentmingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*) (diff)
downloadtgif-1676827c859d838dc104a21f993af40d01586c0f.tar.xz
Merge branch 'kb/msys2-tty' into maint
The "are we talking with TTY, doing an interactive session?" detection has been updated to work better for "Git for Windows". * kb/msys2-tty: mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)
Diffstat (limited to 'git-gui/lib/mergetool.tcl')
0 files changed, 0 insertions, 0 deletions