diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-08-23 18:16:59 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-08-25 10:43:32 -0700 |
| commit | f177b2ec533dea8b61648a856ac8e77bf6407a48 (patch) | |
| tree | d5274df7239f9c3d59df576eca63fee5fc67c64f /dives/test24.xml | |
| parent | 70c38de3a1880b5920fd799b0059518a79ca2acd (diff) | |
| download | subsurface-f177b2ec533dea8b61648a856ac8e77bf6407a48.tar.gz | |
Cloud storage: try to brute force your way around merge issues
This seems to do the right thing in several cases that I tested, but I'm
worried if it might end up causing us data loss in other cases. This needs
a TON of testing.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'dives/test24.xml')
0 files changed, 0 insertions, 0 deletions