Merge branch 'cn/maint-branch-with-bad' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2012 06:17:52 +0000 (22:17 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2012 06:17:52 +0000 (22:17 -0800)
* cn/maint-branch-with-bad:
branch: don't assume the merge filter ref exists

Conflicts:
t/t3200-branch.sh

No differences found