Merge branch 'cn/maint-branch-with-bad'

* cn/maint-branch-with-bad: branch: don't assume the merge filter ref exists Conflicts: t/t3200-branch.sh

Junio C Hamano committed Mar 1, 2012 at 14:44 UTC 7d47367a47c8811f62ad8787091cb27e507c165e

No changes.