Make spork comply with git merge-file
by exiting with amount of merge conflicts
#113
Labels
enhancement
New feature or request
According to the spec, Spork should not only exit non-zero if there are merge conflicts, but it's exit status should in fact be the amount of conflicts, truncated to a maximum of 127.
The text was updated successfully, but these errors were encountered: