Called to merge the contents of a conflict. If this function
returns git_error_code.GIT_PASSTHROUGH then the default (text) merge driver
will instead be invoked. If this function returns
git_error_code.GIT_EMERGECONFLICT then the file will remain conflicted.
Called to merge the contents of a conflict. If this function returns git_error_code.GIT_PASSTHROUGH then the default (text) merge driver will instead be invoked. If this function returns git_error_code.GIT_EMERGECONFLICT then the file will remain conflicted.