Merge branch 'jn/fast-import-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:32 +0000 (29 17:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:32 +0000 (29 17:52 -0800)
* jn/fast-import-fix:
  fast-import: do not clear notes in do_change_note_fanout()
  t9300 (fast-import): another test for the "replace root" feature
  fast-import: tighten M 040000 syntax
  fast-import: filemodify after M 040000 <tree> "" crashes

1  2 
fast-import.c
t/t9300-fast-import.sh

diff --cc fast-import.c
Simple merge
Simple merge