Merge branch 'rr/fi-import-marks-if-exists'

author Junio C Hamano <gitster@pobox.com>

Thu, 10 Feb 2011 00:41:16 +0000 (16:41 -0800)

committer Junio C Hamano <gitster@pobox.com>

Thu, 10 Feb 2011 00:41:16 +0000 (16:41 -0800)
author Junio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:41:16 +0000 (16:41 -0800)
committer Junio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:41:16 +0000 (16:41 -0800)
diff --cc Documentation/git-fast-import.txt
Simple merge
diff --cc fast-import.c
Simple merge
diff --cc t/t9300-fast-import.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Thu, 10 Feb 2011 00:41:16 +0000 (16:41 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Thu, 10 Feb 2011 00:41:16 +0000 (16:41 -0800)
		1	2
Documentation/git-fast-import.txt	patch \|	diff1 \|	diff2 \|	blob \| history
fast-import.c	patch \|	diff1 \|	diff2 \|	blob \| history
t/t9300-fast-import.sh	patch \|	diff1 \|	diff2 \|	blob \| history