From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Nov 2015 23:32:41 +0000 (-0800)
Subject: Merge branch 'jk/merge-file-exit-code' into maint
X-Git-Tag: v2.6.3~17
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5c15ca0b3c866398f22cbab974d0a1964ef105ca

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
---

5c15ca0b3c866398f22cbab974d0a1964ef105ca