summaryrefslogtreecommitdiff
path: root/lib/gitlab/conflict
ModeNameSize
-rw-r--r--file.rb7017logplain
-rw-r--r--file_collection.rb3113logplain