diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index f52c112c9..7eaa98a2c 100644 --- a/src/merge.c +++ b/src/merge.c @@ -26,7 +26,7 @@ int git_repository_merge_cleanup(git_repository *repo) if (git_buf_joinpath(&merge_head_path, repo->path_repository, GIT_MERGE_HEAD_FILE) < 0 || git_buf_joinpath(&merge_mode_path, repo->path_repository, GIT_MERGE_MODE_FILE) < 0 || - git_buf_joinpath(&merge_mode_path, repo->path_repository, GIT_MERGE_MODE_FILE) < 0) + git_buf_joinpath(&merge_msg_path, repo->path_repository, GIT_MERGE_MSG_FILE) < 0) return -1; if (git_path_isfile(merge_head_path.ptr)) { |