diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-05-17 15:59:57 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2013-05-17 16:10:48 -0500 |
| commit | 0e0108f73f83c7cedeaafd480fdcfe3cd6b69d1f (patch) | |
| tree | 83b20d853d19906a3c9e6c7a590d8bedcc0fb506 /tests-clar/reset/default.c | |
| parent | 5b3d52ce37100c1d63229d195041fac3e6f89d28 (diff) | |
| download | libgit2-0e0108f73f83c7cedeaafd480fdcfe3cd6b69d1f.tar.gz | |
introduce git_conflict_iterator
Diffstat (limited to 'tests-clar/reset/default.c')
| -rw-r--r-- | tests-clar/reset/default.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests-clar/reset/default.c b/tests-clar/reset/default.c index 506d971ff..e29e63550 100644 --- a/tests-clar/reset/default.c +++ b/tests-clar/reset/default.c @@ -133,7 +133,7 @@ void test_reset_default__resetting_filepaths_replaces_their_corresponding_index_ */ void test_reset_default__resetting_filepaths_clears_previous_conflicts(void) { - git_index_entry *conflict_entry[3]; + const git_index_entry *conflict_entry[3]; git_strarray after; char *paths[] = { "conflicts-one.txt" }; |