Alejandro Rodríguez 3fcab51ebb Refactor conflict resolution to contain git ops within Gitlab::Git ... This prepares the codebase for a Gitaly migration. See https://gitlab.com/gitlab-org/gitaly/issues/553		2017-10-12 22:03:14 -03:00
..
file.rb	Refactor conflict resolution to contain git ops within Gitlab::Git	2017-10-12 22:03:14 -03:00
file_collection.rb	Refactor conflict resolution to contain git ops within Gitlab::Git	2017-10-12 22:03:14 -03:00