diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-17 17:29:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-17 17:29:24 (GMT) |
| commit | e98fa647aa5673cc95b6e9be1fdc13c0afa2cb37 (patch) | |
| tree | 7faa5518cddae461d03c77fdef7f2a58f2c26dac /builtin/merge-ours.c | |
| parent | 5a77ff74ba5eaef9acb8ea240cb52dd84b874b7a (diff) | |
| parent | 188923f0d1c8148415b3173986cd1e21871c947e (diff) | |
| download | git-e98fa647aa5673cc95b6e9be1fdc13c0afa2cb37.zip git-e98fa647aa5673cc95b6e9be1fdc13c0afa2cb37.tar.gz git-e98fa647aa5673cc95b6e9be1fdc13c0afa2cb37.tar.bz2 | |
Merge branch 'jk/maint-http-half-auth-push' into maint
* jk/maint-http-half-auth-push:
http: fix segfault in handle_curl_result
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions