gitlab-org--gitlab-foss/spec/services/merge_requests/conflicts
Alejandro Rodríguez faa9bd402d Create a Gitlab::Git submodule for conlict-related files
Rename classes to (hopefully) clearer names while we're doing that.
2017-10-12 22:03:15 -03:00
..
list_service_spec.rb Refactor conflict resolution to contain git ops within Gitlab::Git 2017-10-12 22:03:14 -03:00
resolve_service_spec.rb Create a Gitlab::Git submodule for conlict-related files 2017-10-12 22:03:15 -03:00