| commit | 54bc41416c5d3ecb978acb0df80d57aa3e54494c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 30 Oct 2015 20:07:08 +0000 (30 13:07 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 30 Oct 2015 20:07:08 +0000 (30 13:07 -0700) | ||
| tree | a804b8e346b9f79bc461cdb52686d805ff69d535 | treesnapshot (tar.gz zip) |
| parent | f60b5dc68cdb7a75e148c5b98238a880363cf870 | commitdiff |
| parent | e34f80278e920e53b69016c7cecb24e4621e4564 | commitdiff |
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
"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
| builtin/merge-file.c | diff1 | diff2 | blobhistory |
| t/t7600-merge.sh | diff1 | diff2 | blobhistory |