summaryrefslogtreecommitdiff
path: root/lib/gitlab/git/conflict/file.rb
Commit message (Expand)AuthorAgeFilesLines
* Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-121-3/+3
* Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-0/+86