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
Alejandro Rodríguez 65e3a1e9e9 Simplify conflict resolution interface and code 
- Add a Gitlab::Git::Conflict::Resolution class to encapsulate
resolution data
- Simplify conflict file collection assembly
 		2018-01-02 16:22:02 -03:00
..
file.rb Move line code generation into Gitlab::Git 2017-10-12 22:13:05 -03:00
file_collection.rb Simplify conflict resolution interface and code 2018-01-02 16:22:02 -03:00