Code

Merge branch 'maint-1.6.0' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2009 07:10:50 +0000 (23:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2009 07:10:50 +0000 (23:10 -0800)
* maint-1.6.0:
  fast-import: Cleanup mode setting.
  Git.pm: call Error::Simple() properly

1  2 
fast-import.c
perl/Git.pm

diff --cc fast-import.c
Simple merge
diff --cc perl/Git.pm
Simple merge