proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 22:25:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

stash: const up conflict params

Browse Source
This commit is contained in:
Edward Thomson 2015-06-29 15:21:22 -05:00
parent 2cf33fee89
commit 0175971e91
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/stash/apply.c
View File

@ -96,7 +96,7 @@ void test_stash_apply__with_existing_file(void)
void test_stash_apply__merges_new_file(void)
{
git_index_entry *ancestor, *our, *their;
const git_index_entry *ancestor, *our, *their;
cl_git_mkfile("stash/where", "committed before stash\n");
cl_git_pass(git_index_add_bypath(repo_index, "where"));