summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/conflicts
Commit message (Expand)AuthorAgeFilesLines
* Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-15/+14
* Keep trailing newline when picking conflict sections32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-fileSean McGivern2017-06-011-3/+39
* Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missingDouwe Maan2017-05-181-0/+7
* Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-122-0/+295