summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/git/conflict/resolver_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42GitLab Bot2021-06-161-0/+32