Merge branch 'cn/maint-branch-with-bad' into maint
* cn/maint-branch-with-bad: branch: don't assume the merge filter ref exists Conflicts: t/t3200-branch.sh
Junio C Hamano committed
Mar 4, 2012 at 22:17 UTC
57f75f31311d380a3ccfbfe7f483253591cf0c87
No changes.