Merge branch 'maint'
commit59e5fb356ee6abf022e03c446df83879c727b94c
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 May 2009 15:59:20 +0000 (18 08:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 May 2009 15:59:20 +0000 (18 08:59 -0700)
treebf94270a3c809a8967fb24cdfd2331e9a2f00a9c
parent55524fcf9d6676ca3840227092bf3a14ba404615
parent5acb3e5012966cc11e54f50e0592b3639bade02c
Merge branch 'maint'

* maint:
  show-branch: Fix die message in parse_reflog_param()