stash: const up conflict params

ethomson · ethomson · commit 0175971e9164 · 2015-06-29T21:23:09.000Z
diff --git 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"));

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ void test_stash_apply__with_existing_file(void)`
`96`	`96`
`97`	`97`	`void test_stash_apply__merges_new_file(void)`
`98`	`98`	`{`
`99`		`- git_index_entry ancestor, our, *their;`
	`99`	`+ const git_index_entry ancestor, our, *their;`
`100`	`100`
`101`	`101`	`cl_git_mkfile("stash/where", "committed before stash\n");`
`102`	`102`	`cl_git_pass(git_index_add_bypath(repo_index, "where"));`