aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLars Henriksen <LarsHenriksen@get2net.dk>2018-08-22 20:18:36 +0200
committerLukas Fleischer <lfleischer@calcurse.org>2018-10-21 20:01:34 +0200
commitab0fe682255f01e75b70a6ee3e95795020be8dd7 (patch)
treecb609e63b8c0d69f0d2449832ee2c4c79ff35f30 /scripts
parent8c2ccebe3500accf57675553a88f55496eec394a (diff)
downloadcalcurse-ab0fe682255f01e75b70a6ee3e95795020be8dd7.tar.gz
calcurse-ab0fe682255f01e75b70a6ee3e95795020be8dd7.zip
Reload data after resolving save conflict (improved)
After resolving a save conflict with the merge tool, a save operation has, in effect, occurred, and data files must be reloaded to import the result of the conflict resolution. This is a replacement for commit 2fe9c7e. The operations concerned with the user interface are kept out the io-operations (as in all other cases) and take place at the command-level in calcurse.c. and not at the io-level (io.c). Shorter, more concise prompt texts. Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk> Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions