Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2009 19:02:18 +0000 (12:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2009 19:02:18 +0000 (12:02 -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