| commit | a37929e2daeef87c5438ae94a4aa4c1d7ef1d6ab | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Feb 2012 21:31:47 +0000 (28 13:31 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Feb 2012 21:31:47 +0000 (28 13:31 -0800) | ||
| tree | 2c8866d0c5ec701349abc91d427fb2f0d8791384 | treesnapshot (tar.gz zip) |
| parent | ae15b422cc94c9504ff08a5cf5b7b79f8e3fad27 | commitdiff |
| parent | 6c41e97557d94df7085e3c0cff247305c9401968 | commitdiff |
Merge branch 'cn/maint-branch-with-bad' into next
* 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 | blobhistory |
| t/t3200-branch.sh | diff1 | diff2 | blobhistory |