Merge branch 'jk/merge-file-exit-code'
authorJunio C Hamano <gitster@pobox.com>
Fri, 30 Oct 2015 20:07:08 +0000 (13:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 30 Oct 2015 20:07:08 +0000 (13:07 -0700)
"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

1  2 
builtin/merge-file.c
t/t7600-merge.sh

Simple merge
Simple merge