Merge branch 'master'
authorJunio C Hamano <junkio@cox.net>
Sun, 12 Feb 2006 21:15:12 +0000 (13:15 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 12 Feb 2006 21:15:12 +0000 (13:15 -0800)
commite76d1bec04d342d84686ad9c5fd47f048fd94609
tree0a5fe9e3554fb3f55f7713fb40221ef72b37736c
parenteafaa043cd3fc65cfaaa9adb5cf42524790c3a4a
parentbd9ca0baff88107e26915cdaaf9821dc70a187e3
Merge branch 'master'

* master:
  GIT 1.2.0
  Fix "test: unexpected operator" on bsd