![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Mar 2012 06:17:52 +0000 (22:17 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Mar 2012 06:17:52 +0000 (22:17 -0800) | ||
| commit | 57f75f31311d380a3ccfbfe7f483253591cf0c87 | |
| tree | 888f2fde04c7d9b3ed4af4cff48f190d26f9a9fb | tree | snapshot |
| parent | 3ecd0c8b4d9e245e255aa4c061d6a474eb571298 | commit | diff |
| parent | 6c41e97557d94df7085e3c0cff247305c9401968 | commit | diff |
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
* cn/maint-branch-with-bad:
branch: don't assume the merge filter ref exists
Conflicts:
t/t3200-branch.sh
| builtin/branch.c | diff1 | | diff2 | | blob | history |
| t/t3200-branch.sh | diff1 | | diff2 | | blob | history |