diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-30 13:07:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-30 13:07:08 -0700 |
| commit | 54bc41416c5d3ecb978acb0df80d57aa3e54494c (patch) | |
| tree | a804b8e346b9f79bc461cdb52686d805ff69d535 /http.h | |
| parent | f60b5dc68cdb7a75e148c5b98238a880363cf870 (diff) | |
| parent | e34f80278e920e53b69016c7cecb24e4621e4564 (diff) | |
| download | git-54bc41416c5d3ecb978acb0df80d57aa3e54494c.tar.gz git-54bc41416c5d3ecb978acb0df80d57aa3e54494c.tar.xz | |
Merge branch 'jk/merge-file-exit-code'
"git merge-file" tried to signal how many conflicts it found, which
obviously would not work well when there are too many of them.
* jk/merge-file-exit-code:
merge-file: clamp exit code to maximum 127
Diffstat (limited to 'http.h')
0 files changed, 0 insertions, 0 deletions