summaryrefslogtreecommitdiff
path: root/lib/gitlab/git/conflict
ModeNameSize
-rw-r--r--file.rb2791logplain
-rw-r--r--parser.rb2650logplain
-rw-r--r--resolver.rb3314logplain