root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
gitlab-ce/lib/gitlab/conflict
History
Sean McGivern 3764fd4b41 Add blob_ace_mode to conflict content response 2016-10-13 14:16:35 -05:00
..
file.rb Add blob_ace_mode to conflict content response 2016-10-13 14:16:35 -05:00
file_collection.rb Allow setting content for resolutions 2016-10-13 14:16:34 -05:00
parser.rb Allow setting content for resolutions 2016-10-13 14:16:34 -05:00
resolution_error.rb Allow setting content for resolutions 2016-10-13 14:16:34 -05:00