From 0175971e91641cd07246f59003930d81019ce40b Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Mon, 29 Jun 2015 15:21:22 -0500
Subject: [PATCH] stash: const up conflict params

---
 tests/stash/apply.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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"));