Move merge operation to standalone low-level function
Use GIT_AUTHOR_EMAIL or GIT_AUTHOR_NAME when merging without config