diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-24 15:20:06 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-08-25 12:34:54 +0100 |
| commit | 4a3d1a5838685ff95a6c9416bb3e453ad143f50d (patch) | |
| tree | f7066e25c845ed6efb75f9af056244fd832d5e7d /spec/factories_spec.rb | |
| parent | 7bbb523b23638c52b3c0ba43d8f3dbef8840aad6 (diff) | |
| download | gitlab-ce-4a3d1a5838685ff95a6c9416bb3e453ad143f50d.tar.gz | |
Handle case where conflicts aren't on disk yet
Diffstat (limited to 'spec/factories_spec.rb')
0 files changed, 0 insertions, 0 deletions