diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-26 05:44:42 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-26 05:44:42 +0200 |
| commit | 636614f337409abccf60b00dddd04e6628bf85de (patch) | |
| tree | cf92d285c1211935247d1d00d5e9c9e6992352be /t/t8004-blame-with-conflicts.sh | |
| parent | Git 2.4 (diff) | |
| parent | Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3 (diff) | |
| download | git-636614f337409abccf60b00dddd04e6628bf85de.tar.xz git-636614f337409abccf60b00dddd04e6628bf85de.zip | |
Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlock
* jk/http-backend-deadlock-2.3:
http-backend: spool ref negotiation requests to buffer
t5551: factor out tag creation
http-backend: fix die recursion with custom handler
Diffstat (limited to 't/t8004-blame-with-conflicts.sh')
0 files changed, 0 insertions, 0 deletions