Merge branch 'hold/am'
authorJunio C Hamano <junkio@cox.net>
Wed, 14 Dec 2005 21:04:43 +0000 (13:04 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 14 Dec 2005 21:04:43 +0000 (13:04 -0800)
1  2 
git-am.sh

diff --cc git-am.sh
Simple merge