Lukas Fleischer 2fe9c7efce 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>

2017-09-08 21:23:25 +02:00

..

apoint.c

Fix support for punctual appointments at 00:00

2017-08-28 07:06:06 +02:00

args.c

Check for optional argument to -s option

2017-08-12 15:38:24 +02:00

calcurse.c

Only reload if data files were changed

2017-09-08 21:08:54 +02:00

calcurse.h

Use a shared input/output mutex

2017-09-08 21:08:54 +02:00

config.c

Make the day heading position configurable

2017-09-08 21:08:53 +02:00

custom.c

Make the day heading position configurable

2017-09-08 21:08:53 +02:00

day.c

Remove extra star from recurrent appointments

2017-08-28 07:30:38 +02:00

dmon.c

Update copyright ranges

2017-01-12 08:40:30 +01:00

event.c

Update copyright ranges

2017-01-12 08:40:30 +01:00

getstring.c

Implement CTRL-U in getstring()

2017-08-29 20:14:39 +02:00

help.c

Fix fatal error when using the help command

2017-08-12 15:38:55 +02:00

hooks.c

Update copyright ranges

2017-01-12 08:40:30 +01:00

htable.h

Update copyright ranges

2017-01-12 08:40:30 +01:00

ical.c

Do not read past NUL character in ical_get_value()

2017-02-08 07:32:35 +01:00

io.c

Reload data after resolving save conflict

2017-09-08 21:23:25 +02:00

keys.c

Add a function to wait for any key press

2017-09-03 16:37:35 +02:00

listbox.c

Update copyright ranges

2017-01-12 08:40:30 +01:00

llist_ts.h

Update copyright ranges

2017-01-12 08:40:30 +01:00

llist.c

Update copyright ranges

2017-01-12 08:40:30 +01:00

llist.h

Update copyright ranges

2017-01-12 08:40:30 +01:00

Makefile.am

Implement utility functions for dynamic strings

2016-01-13 17:39:44 +01:00

mem.c

Update copyright ranges

2017-01-12 08:40:30 +01:00

note.c

Update copyright ranges

2017-01-12 08:40:30 +01:00

notify.c

Rename keys_getch() to keys_get()

2017-08-30 16:26:10 +02:00

pcal.c

Update copyright ranges

2017-01-12 08:40:30 +01:00

recur.c

Fix another error in the notification code

2017-02-11 11:50:51 +01:00

sha1.c

Update copyright ranges

2017-01-12 08:40:30 +01:00

sha1.h

Update copyright ranges

2017-01-12 08:40:30 +01:00

sigs.c

Update copyright ranges

2017-01-12 08:40:30 +01:00

strings.c

Extend strings API for formatted dates

2017-08-28 07:30:38 +02:00

todo.c

Update copyright ranges

2017-01-12 08:40:30 +01:00

ui-calendar.c

Remove phase of moon feature

2017-09-08 21:08:53 +02:00

ui-day.c

Make the day heading position configurable

2017-09-08 21:08:53 +02:00

ui-todo.c

Replace remaining uses of wgetch() by keys_wgetch()

2017-09-03 16:37:35 +02:00

utf8.c

Factor out UTF-8 code point decoding

2017-08-30 16:17:28 +02:00

utils.c

Remove phase of moon feature

2017-09-08 21:08:53 +02:00

vars.c

Add CALCURSE_{EDITOR,PAGER,MERGETOOL} environment variables

2017-09-08 21:08:53 +02:00

vector.c

Update copyright ranges

2017-01-12 08:40:30 +01:00

vector.h

Update copyright ranges

2017-01-12 08:40:30 +01:00

wins.c

Interrupt periodic save when launching process

2017-09-08 21:08:54 +02:00