Code

Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Sun, 23 Oct 2005 08:20:41 +0000 (01:20 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 23 Oct 2005 08:20:41 +0000 (01:20 -0700)
1  2 
show-branch.c

diff --cc show-branch.c
Simple merge