Jacek Sowiński 6590a1eeff Wrap symlink and regular conflicts into one case ...

This way we're not duplicating collision-related code.

2017-03-20 20:26:14 +01:00

..

file_actions.rb

Wrap symlink and regular conflicts into one case

2017-03-20 20:26:14 +01:00

git_actions.rb

Coding standards fixes based off of Rubocop and minor edits to make

2015-10-12 19:30:29 -04:00