Only run the merge tool on files with differences

If the backup file and the data file are equal, there is no need to run
the merge tool.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer
2014-07-17 11:47:00 +02:00
parent 7920e761c9
commit ae7d2d4c6b
3 changed files with 41 additions and 6 deletions

View File

@@ -781,6 +781,7 @@ void io_stop_psave_thread(void);
void io_set_lock(void);
unsigned io_dump_pid(char *);
unsigned io_get_pid(char *);
int io_files_equal(const char *, const char *);
int io_file_is_empty(char *);
int io_file_cp(const char *, const char *);
void io_unset_modified(void);