Merge branch 'maint'
commitada59fcd3230e661bc1110702a2fb4ef76371bc1
authorJunio C Hamano <gitster@pobox.com>
Sun, 2 Dec 2007 19:00:45 +0000 (2 11:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 2 Dec 2007 19:00:45 +0000 (2 11:00 -0800)
treea700bdf88015f1cbfcccaf4e006f8847a4bc8025
parent1c46ab1fada6eb449336a624995293cdd74f2b08
parent4e596e988abfd7ce0b4456cdbf27baa16fa7aab8
Merge branch 'maint'

* maint:
  t9600: test cvsimport from CVS working tree