int i, index_fd, clean;
char *oneline, *reencoded_message = NULL;
const char *message, *encoding;
- const char *defmsg = git_pathdup("MERGE_MSG");
+ char *defmsg = git_pathdup("MERGE_MSG");
struct merge_options o;
struct tree *result, *next_tree, *base_tree, *head_tree;
static struct lock_file index_lock;
return execv_git_cmd(args);
}
free(reencoded_message);
+ free(defmsg);
return 0;
}