summaryrefslogtreecommitdiff
path: root/file.c
diff options
context:
space:
mode:
Diffstat (limited to 'file.c')
-rw-r--r--file.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/file.c b/file.c
index 72771c46be..f5e39f6581 100644
--- a/file.c
+++ b/file.c
@@ -1411,8 +1411,6 @@ cf_merge_files_to_tempfile(gpointer pd_window, char **out_filenamep,
break;
}
- g_free(err_info);
-
cf_callback_invoke(cf_cb_file_merge_finished, NULL);
if (status != MERGE_OK) {