Alejandro Rodríguez 240945f87e Simplify conflict resolver interface ... This does two things: - Pass commit oids instead of `Gitlab::Git::Commit`s. We only need the former. - Depend on only the target repository for conflict listing. For conflict resolution, treat one repository as a remote one so that we can implement it as such in Gitaly.		2017-12-14 16:02:50 -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	Simplify conflict resolver interface	2017-12-14 16:02:50 -03:00