Code

Merge branch 'jn/test-terminal-punt-on-osx-breakage'
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Mar 2011 23:02:26 +0000 (15:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Mar 2011 23:02:26 +0000 (15:02 -0800)
* jn/test-terminal-punt-on-osx-breakage:
  tests: skip terminal output tests on OS X


Trivial merge