![]() 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. |
||
---|---|---|
.. | ||
list_service_spec.rb | ||
resolve_service_spec.rb |
![]() 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. |
||
---|---|---|
.. | ||
list_service_spec.rb | ||
resolve_service_spec.rb |