diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-03-01 14:44:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-01 14:44:17 -0800 |
| commit | 7d47367a47c8811f62ad8787091cb27e507c165e (patch) | |
| tree | 2bbbbe59da90ccf5ada1391cce11cb0a0d87426d /progress.h | |
| parent | Update draft release notes to 1.7.10 (diff) | |
| parent | branch: don't assume the merge filter ref exists (diff) | |
| download | tgif-7d47367a47c8811f62ad8787091cb27e507c165e.tar.xz | |
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
Diffstat (limited to 'progress.h')
0 files changed, 0 insertions, 0 deletions