Merge branch 'jn/test-terminal-punt-on-osx-breakage' into next
commitd754139c48227d3bde1de37166f299c05176622c
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Feb 2011 22:23:06 +0000 (23 14:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Feb 2011 22:23:06 +0000 (23 14:23 -0800)
tree8bf8c33de24295515623af130024d639d6720260
parent49da967d0b818f93e4bb950c04359cd24ba45340
parent339e5638b0a11ea3218214ffb57732098c3705df
Merge branch 'jn/test-terminal-punt-on-osx-breakage' into next

* jn/test-terminal-punt-on-osx-breakage:
  tests: skip terminal output tests on OS X