summaryrefslogtreecommitdiff
path: root/lib/gitlab/git/conflict/resolution.rb
Commit message (Expand)AuthorAgeFilesLines
* Enable even more frozen string in lib/gitlabrepo-forks/gitlab-ce-frozen-string-lib-gitlab-even-moregfyoung2018-11-131-0/+2
* Simplify conflict resolution interface and codegitaly-conflict-resolverAlejandro Rodríguez2018-01-021-0/+15