Merge part of js/portable into next

author Junio C Hamano <junkio@cox.net>
Sun, 19 Feb 2006 07:19:33 +0000 (23:19 -0800)

committer Junio C Hamano <junkio@cox.net>
Sun, 19 Feb 2006 07:19:33 +0000 (23:19 -0800)
author: Junio C Hamano <junkio@cox.net>
Sun, 19 Feb 2006 07:19:33 +0000 (23:19 -0800)
committer: Junio C Hamano <junkio@cox.net>
Sun, 19 Feb 2006 07:19:33 +0000 (23:19 -0800)
diff --cc Makefile
Simple merge
diff --cc git-merge.sh
Simple merge
diff --cc t/test-lib.sh
Simple merge
author	Junio C Hamano <junkio@cox.net>
author	Sun, 19 Feb 2006 07:19:33 +0000 (23:19 -0800)
committer	Junio C Hamano <junkio@cox.net>
committer	Sun, 19 Feb 2006 07:19:33 +0000 (23:19 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
git-merge.sh	patch \|	diff1 \|	diff2 \|	blob \| history
t/test-lib.sh	patch \|	diff1 \|	diff2 \|	blob \| history