Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Oct 2009 21:48:51 +0000 (14:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Oct 2009 21:48:51 +0000 (14:48 -0700)
* maint:
  show-branch: fix segfault when showbranch.default exists

1  2 
builtin-show-branch.c

Simple merge