Merge branch 'bc/maint-1.6.1-branch-deleted-was'
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Mar 2009 07:26:47 +0000 (00:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Mar 2009 07:26:47 +0000 (00:26 -0700)
* bc/maint-1.6.1-branch-deleted-was:
  git-branch: display "was sha1" on branch deletion rather than just "sha1"

Conflicts:
builtin-branch.c


No differences found