summaryrefslogtreecommitdiff
path: root/mergetools/winmerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-02-17 10:03:41 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-17 10:03:41 -0800
commit7516977b4adc38937d95d8c7da8944153784bf9a (patch)
tree2903fd4f663bb9255f10bf696eba0c5eb41407ad /mergetools/winmerge
parentMerge branch 'aw/push-force-with-lease-reporting' into maint (diff)
parenttest-lib: limit the output of the yes utility (diff)
downloadtgif-7516977b4adc38937d95d8c7da8944153784bf9a.tar.xz
Merge branch 'js/test-lib-windows-emulated-yes' into maint
The emulated "yes" command used in our test scripts has been tweaked not to spend too much time generating unnecessary output that is not used, to help those who test on Windows where it would not stop until it fills the pipe buffer due to lack of SIGPIPE. * js/test-lib-windows-emulated-yes: test-lib: limit the output of the yes utility
Diffstat (limited to 'mergetools/winmerge')
0 files changed, 0 insertions, 0 deletions