Merge part of js/portable into next
authorJunio C Hamano <junkio@cox.net>
Sun, 19 Feb 2006 07:19:33 +0000 (23:19 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 19 Feb 2006 07:19:33 +0000 (23:19 -0800)
1  2 
Makefile
git-merge.sh
t/test-lib.sh

diff --cc Makefile
Simple merge
diff --cc git-merge.sh
Simple merge
diff --cc t/test-lib.sh
Simple merge