Merge branch 'jc/maint-obsd46' into maint
commitd828fdb8d79b1d06b3015d9a45da24ac3f887484
authorJunio C Hamano <gitster@pobox.com>
Sat, 26 Dec 2009 22:15:55 +0000 (26 14:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 26 Dec 2009 22:15:55 +0000 (26 14:15 -0800)
tree929110458a6ea604f3fefafe432e067993959402
parent5717b47c59b0d01d9820dd6d4073d7428d9d4c6e
parenteca4460eeb18b895cb6ca590490073f75fd010a6
Merge branch 'jc/maint-obsd46' into maint

* jc/maint-obsd46:
  t4019 "grep" portability fix
  t1200: work around a bug in some implementations of "find"