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
..
file.rb	Add missing attr_accessor to Gitlab::Git::Conflict::File	2017-12-04 16:11:54 -03:00
parser.rb
resolver.rb	Simplify conflict resolver interface	2017-12-14 16:02:50 -03:00