Junio C Hamano 5c15ca0b3c 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

2015-11-03 15:32:41 -08:00

3.2 KiB

Raw Blame History

View Raw