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)
commit53d31d71b7432391a8a5c7fdcbc38d803d6bd7e2
tree6b3a67bfcec9e34fbd127ddff4463a0529fae8b4
parent51aca1665b9fa8214927780fbccd1915649b3c44
parent339e5638b0a11ea3218214ffb57732098c3705df
Merge branch 'jn/test-terminal-punt-on-osx-breakage'

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