diff options
| author | Lukas Fleischer <lfleischer@calcurse.org> | 2017-09-08 21:02:18 +0200 |
|---|---|---|
| committer | Lukas Fleischer <lfleischer@calcurse.org> | 2017-09-08 21:23:25 +0200 |
| commit | 2fe9c7efcee3812d46f367d3321c924ca4152485 (patch) | |
| tree | 649ee29fd702e7987f1a00240b88952e24c7c55c /build-aux%25252525253fid%25252525253d8ab3106f6bd4967f145aeefdebe50a776c18c7b9%252525253fid%252525253d8ab3106f6bd4967f145aeefdebe50a776c18c7b9&id2%252525253d2fe9c7efcee3812d46f367d3321c924ca4152485%2525253fid%2525253d8ab3106f6bd4967f145aeefdebe50a776c18c7b9&id2%2525253d2fe9c7efcee3812d46f367d3321c924ca4152485%25253fid%25253d8ab3106f6bd4967f145aeefdebe50a776c18c7b9%253fid%253d2fe9c7efcee3812d46f367d3321c924ca4152485%3fid%3d2fe9c7efcee3812d46f367d3321c924ca4152485&id2%3de943a8a4dbb8b5d6ad280ba2a576cdd9e7e66a63?id=2fe9c7efcee3812d46f367d3321c924ca4152485 | |
| parent | e943a8a4dbb8b5d6ad280ba2a576cdd9e7e66a63 (diff) | |
Reload data after resolving save conflict
After resolving a save conflict with the merge tool, we need to reload
the data files to import the result of the conflict resolution.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Diffstat (limited to 'build-aux%25252525253fid%25252525253d8ab3106f6bd4967f145aeefdebe50a776c18c7b9%252525253fid%252525253d8ab3106f6bd4967f145aeefdebe50a776c18c7b9&id2%252525253d2fe9c7efcee3812d46f367d3321c924ca4152485%2525253fid%2525253d8ab3106f6bd4967f145aeefdebe50a776c18c7b9&id2%2525253d2fe9c7efcee3812d46f367d3321c924ca4152485%25253fid%25253d8ab3106f6bd4967f145aeefdebe50a776c18c7b9%253fid%253d2fe9c7efcee3812d46f367d3321c924ca4152485%3fid%3d2fe9c7efcee3812d46f367d3321c924ca4152485&id2%3de943a8a4dbb8b5d6ad280ba2a576cdd9e7e66a63?id=2fe9c7efcee3812d46f367d3321c924ca4152485')
0 files changed, 0 insertions, 0 deletions