summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/git/conflict/parser_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@13-3-stable-eeGitLab Bot2020-08-201-0/+3
* Add latest changes from gitlab-org/gitlab@13-2-stable-eeGitLab Bot2020-07-201-1/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-02-041-74/+74
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-11-211-1/+3
* Fix 500 error when trying to resolve non-ASCII conflicts in editorSean McGivern2018-03-231-7/+0
* Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-0/+224