[EE] Conflict resolution refactor
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
[EE] Conflict resolution refactor
Alejandro Rodríguez
requested to merge
ee-conflict-resolution-refactor
into
master
Oct 13, 2017
Overview
0
Commits
6
Pipelines
0
Changes
27
EE counterpart of
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14747
Merge request reports
Loading