![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 1 Mar 2012 22:44:17 +0000 (14:44 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 1 Mar 2012 22:44:17 +0000 (14:44 -0800) | ||
| commit | 7d47367a47c8811f62ad8787091cb27e507c165e | |
| tree | 2bbbbe59da90ccf5ada1391cce11cb0a0d87426d | tree | snapshot |
| parent | f051ad6d118aff0252beed36d20a56d1823fc90b | commit | diff |
| parent | 6c41e97557d94df7085e3c0cff247305c9401968 | commit | diff |
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
* 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 |