Merge branch 'jn/test-terminal-punt-on-osx-breakage' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2011 23:47:26 +0000 (16:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2011 23:47:26 +0000 (16:47 -0700)
* jn/test-terminal-punt-on-osx-breakage:
  tests: skip terminal output tests on OS X


Trivial merge