lib/gitlab/conflict/file_collection.rb · 0bba60f52c7557894007401b81f2e242c327bb7b · Forest Godfrey / gitlab-ce

BigW Consortium Gitlab

authored Dec 27, 2017

- Add a Gitlab::Git::Conflict::Resolution class to encapsulate
resolution data
- Simplify conflict file collection assembly

65e3a1e9

file_collection.rb 1.88 KB