diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-06-29 15:21:22 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-06-29 21:23:09 +0000 |
| commit | 0175971e91641cd07246f59003930d81019ce40b (patch) | |
| tree | d7667feb53856a334a95a92e759ed013bf6b4f5c | |
| parent | 2cf33fee89f3a7a3b1097e30d0468239048689ab (diff) | |
| download | libgit2-0175971e91641cd07246f59003930d81019ce40b.tar.gz | |
stash: const up conflict params
| -rw-r--r-- | tests/stash/apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/stash/apply.c b/tests/stash/apply.c index 1056ce7eb..f26b73b19 100644 --- a/tests/stash/apply.c +++ b/tests/stash/apply.c @@ -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")); |