diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:41 -0800 |
| commit | 5c15ca0b3c866398f22cbab974d0a1964ef105ca (patch) | |
| tree | f7c7b00472862c2665c05bf522836b6401dc4e8e /unix-socket.c | |
| parent | 3a27eec48ecfcc0764c90b3f478a124c01c082bc (diff) | |
| parent | e34f80278e920e53b69016c7cecb24e4621e4564 (diff) | |
| download | git-5c15ca0b3c866398f22cbab974d0a1964ef105ca.tar.gz | |
Merge branch 'jk/merge-file-exit-code' into maint
"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 'unix-socket.c')
0 files changed, 0 insertions, 0 deletions