diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-08-24 16:21:53 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-08-25 10:44:21 -0700 |
| commit | a2c638f63fd94861e60d8dfdad517e6e14785d9f (patch) | |
| tree | 20039d97108488d4ddb94c99d1d7772a04de3bcd /tests/testgitstorage.cpp | |
| parent | 9f5a944107b7a8852adccd6da71dc94baa374bb5 (diff) | |
| download | subsurface-a2c638f63fd94861e60d8dfdad517e6e14785d9f.tar.gz | |
Cloud storage: attempt to deal with conflicts about deleted files
This doesn't seem right, but it works. Definitely needs more analysis.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'tests/testgitstorage.cpp')
0 files changed, 0 insertions, 0 deletions