Sean McGivern 57fc7cd8f3 Make sure ConflictsService does not raise for conflicting submodules		2018-07-10 15:06:20 +01:00
..
list_service_spec.rb	Make sure ConflictsService does not raise for conflicting submodules	2018-07-10 15:06:20 +01:00
resolve_service_spec.rb	Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'""	2018-07-06 11:43:01 +02:00