Merge branch 'jn/fast-import-empty-tree-removal' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jan 2011 18:23:53 +0000 (10:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jan 2011 18:23:53 +0000 (10:23 -0800)
commit5ce3258122939f93a927c75d308c1c34038f0386
treef4a60897502baeb1be16c81b4dafc08aa5c5bdac
parent4ac5356c62d02b118c49cd85f88c7e6f65590400
parent8fe533f686e20852fa9bd2df2755faed7c7bcdcc
Merge branch 'jn/fast-import-empty-tree-removal' into maint

* jn/fast-import-empty-tree-removal:
  fast-import: treat filemodify with empty tree as delete
fast-import.c
t/t9300-fast-import.sh