diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-03-04 22:17:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-04 22:17:52 -0800 |
| commit | 57f75f31311d380a3ccfbfe7f483253591cf0c87 (patch) | |
| tree | 888f2fde04c7d9b3ed4af4cff48f190d26f9a9fb /t/t4100/t-apply-7.expect | |
| parent | Merge branch 'jn/maint-gitweb-invalid-regexp' into maint (diff) | |
| parent | branch: don't assume the merge filter ref exists (diff) | |
| download | tgif-57f75f31311d380a3ccfbfe7f483253591cf0c87.tar.xz | |
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
Diffstat (limited to 't/t4100/t-apply-7.expect')
0 files changed, 0 insertions, 0 deletions