Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib/gitlab/git/conflict
AgeCommit message (Expand)Author
2018-01-02Simplify conflict resolution interface and codeAlejandro Rodríguez
2017-12-27Incorporate ConflictsService.ResolveConflicts Gitaly RPCAlejandro Rodríguez
2017-12-27Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez
2017-12-14Simplify conflict resolver interfaceAlejandro Rodríguez
2017-12-04Use `String#end_with?` instead of `String#ends_with?`Alejandro Rodríguez
2017-12-04Add missing attr_accessor to Gitlab::Git::Conflict::FileAlejandro Rodríguez
2017-10-13Move line code generation into Gitlab::GitAlejandro Rodríguez
2017-10-13Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez
    generated by cgit v1.2.3 (git 2.25.1) at 2024-08-11 07:45:46 +0300