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)
commitc9b7cc04739bd744f7f28742de9ac65a61adebc2
tree58739d1c83b14fe4e1f56dc2e1884e96e28e7e1c
parent8209b7fb9beecdeb47180b57b2dfe1666ec27f82
parent339e5638b0a11ea3218214ffb57732098c3705df
Merge branch 'jn/test-terminal-punt-on-osx-breakage' into maint

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