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)
commit57f75f31311d380a3ccfbfe7f483253591cf0c87
tree888f2fde04c7d9b3ed4af4cff48f190d26f9a9fb
parent3ecd0c8b4d9e245e255aa4c061d6a474eb571298
parent6c41e97557d94df7085e3c0cff247305c9401968
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
builtin/branch.c
t/t3200-branch.sh