summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/conflicts
ModeNameSize
-rw-r--r--list_service_spec.rb3164logplain
-rw-r--r--resolve_service_spec.rb8271logplain