lib/gitlab/conflict/file_collection.rb · 65e3a1e9e9a316a2bbbcd49e22b858b8b1bd9890 · Boxiang Sun / gitlab-ce

You need to sign in or sign up before continuing.

Alejandro Rodríguez 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