Sean McGivern f99941d7ec Keep trailing newline when picking conflict sections ... 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.		2017-06-01 14:04:21 +01:00
..
list_service_spec.rb	…
resolve_service_spec.rb	Keep trailing newline when picking conflict sections	2017-06-01 14:04:21 +01:00