Merge branch 'jk/maint-add-p-empty'

author Junio C Hamano <gitster@pobox.com>

Mon, 16 Nov 2009 00:40:46 +0000 (16:40 -0800)

committer Junio C Hamano <gitster@pobox.com>

Mon, 16 Nov 2009 00:40:46 +0000 (16:40 -0800)
author Junio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 00:40:46 +0000 (16:40 -0800)
committer Junio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 00:40:46 +0000 (16:40 -0800)
diff --cc git-add--interactive.perl
Simple merge
diff --cc t/t3701-add-interactive.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Mon, 16 Nov 2009 00:40:46 +0000 (16:40 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 16 Nov 2009 00:40:46 +0000 (16:40 -0800)
		1	2
git-add--interactive.perl	patch \|	diff1 \|	diff2 \|	blob \| history
t/t3701-add-interactive.sh	patch \|	diff1 \|	diff2 \|	blob \| history