65e3a1e9e9
- Add a Gitlab::Git::Conflict::Resolution class to encapsulate resolution data - Simplify conflict file collection assembly |
||
|---|---|---|
| .. | ||
| commit_service_spec.rb | ||
| conflicts_service_spec.rb | ||
| diff_spec.rb | ||
| diff_stitcher_spec.rb | ||
| notification_service_spec.rb | ||
| operation_service_spec.rb | ||
| ref_service_spec.rb | ||
| remote_service_spec.rb | ||
| repository_service_spec.rb | ||
| util_spec.rb | ||
| wiki_service_spec.rb | ||