stash: const up conflict params

0175971e · Edward Thomson · 2cf33fee · 0175971e
Commit 0175971e authored Jun 29, 2015 by Edward Thomson
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

tests/stash/apply.c
+1 -1

No files found.
--- 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"));