summaryrefslogtreecommitdiff
path: root/lib/gitlab/git/conflict/resolver.rb
Commit message (Expand)AuthorAgeFilesLines
* Simplify conflict resolver interfacegitaly-conflicts-prepAlejandro Rodríguez2017-12-141-30/+29
* Use `String#end_with?` instead of `String#ends_with?`gitaly-conflict-fileAlejandro Rodríguez2017-12-041-1/+1
* Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-0/+91