Merge branch 'master' of git://repo.or.cz/git/fastimport
authorJunio C Hamano <junkio@cox.net>
Thu, 8 Mar 2007 07:10:05 +0000 (23:10 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 8 Mar 2007 07:10:05 +0000 (23:10 -0800)
* 'master' of git://repo.or.cz/git/fastimport:
  Allow fast-import frontends to reload the marks table
  Use atomic updates to the fast-import mark file
  Preallocate memory earlier in fast-import

1  2 
fast-import.c

diff --cc fast-import.c
Simple merge