Merge branch 'conflict-resolution-refactor' into 'master'
Conflict resolution refactor See merge request gitlab-org/gitlab-ce!14747
Showing
lib/gitlab/conflict/parser.rb
已删除
100644 → 0
lib/gitlab/diff/line_code.rb
已删除
100644 → 0
lib/gitlab/git/conflict/file.rb
0 → 100644
lib/gitlab/git/conflict/parser.rb
0 → 100644
想要评论请 注册 或 登录