BigW Consortium Gitlab
Skip to content
GitLab
Explore
Sign in
gitlab-ce
app
views
projects
merge_requests
conflicts
_file_actions.html.haml
Find file
Blame
Permalink
Sep 29, 2016
197ac5eb
Ability to resolve conflicts for files with `text-editor` as conflict type
· 197ac5eb
Alfredo Sumaran
authored
Sep 29, 2016
197ac5eb
Ability to resolve conflicts for files with `text-editor` as conflict type
Alfredo Sumaran
authored
Sep 29, 2016
Loading
