gitlab-org--gitlab-foss/lib/gitlab/conflict
Sean McGivern f3cf40b8aa Handle case where one side deleted the file 2016-08-12 23:24:46 +03:00
..
file.rb Highlight files based on merged file 2016-08-12 23:24:45 +03:00
file_collection.rb Handle case where one side deleted the file 2016-08-12 23:24:46 +03:00
parser.rb Raise errors for large and binary files 2016-08-12 23:24:44 +03:00