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
..
base_service.rb
list_service.rb	Stop MR conflict code from blowing up when branches are missing	2017-05-18 15:48:42 -05:00
resolve_service.rb	Keep trailing newline when picking conflict sections	2017-06-01 14:04:21 +01:00