Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Privacy
Imprint
Contact
Sign in
Toggle navigation
Menu
projects.thm.de
GitLab FOSS
Repository
gitlab
spec
lib
gitlab
conflict
file_spec.rb
Find file
Blame
History
Permalink
Allow resolving conflicts in MR controller
· 14a4b17d
Sean McGivern
authored
Jul 27, 2016
14a4b17d