summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/conflicts
ModeNameSize
-rw-r--r--base_service.rb199logplain
-rw-r--r--list_service.rb1494logplain
-rw-r--r--resolve_service.rb2026logplain