Alejandro Rodríguez bb2bf39ddf Cache `#can_be_resolved_in_ui?` git operations		2018-03-08 11:54:21 -03:00
..
file_collection_spec.rb	Cache `#can_be_resolved_in_ui?` git operations	2018-03-08 11:54:21 -03:00
file_spec.rb	Fix conflict highlighting	2017-11-17 17:57:48 +00:00