From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 30 Oct 2015 20:07:08 +0000 (-0700)
Subject: Merge branch 'jk/merge-file-exit-code'
X-Git-Tag: v2.7.0-rc0~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54bc41416c5d3ecb978acb0df80d57aa3e54494c;p=thirdparty%2Fgit.git

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

54bc41416c5d3ecb978acb0df80d57aa3e54494c