f99941d7ec
If our side of the conflict file has a trailing newline, and we are picking sections, not editing the whole content, then add a trailing newline back. |
||
|---|---|---|
| .. | ||
| conflicts | ||
| add_todo_when_build_fails_service_spec.rb | ||
| assign_issues_service_spec.rb | ||
| build_service_spec.rb | ||
| close_service_spec.rb | ||
| create_from_issue_service_spec.rb | ||
| create_service_spec.rb | ||
| get_urls_service_spec.rb | ||
| merge_request_diff_cache_service_spec.rb | ||
| merge_service_spec.rb | ||
| merge_when_pipeline_succeeds_service_spec.rb | ||
| post_merge_service_spec.rb | ||
| refresh_service_spec.rb | ||
| reopen_service_spec.rb | ||
| resolved_discussion_notification_service_spec.rb | ||
| update_service_spec.rb | ||