diff options
| author | Vicent Marti <tanoku@gmail.com> | 2013-05-01 15:31:23 +0200 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2013-05-01 15:31:23 +0200 |
| commit | e1807113c43b7c5008e2d5c8c449ae56c8dceeb4 (patch) | |
| tree | fa1222e2333699be7a39652768ab150bd5f827d4 /src/merge.c | |
| parent | 2ba55c1f0df3400c15dbdd7b21d1f3d354ab2e3c (diff) | |
| download | libgit2-e1807113c43b7c5008e2d5c8c449ae56c8dceeb4.tar.gz | |
merge: Warning noise
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index 3595eb058..320be005a 100644 --- a/src/merge.c +++ b/src/merge.c @@ -1269,7 +1269,7 @@ int git_merge_diff_list__find_differences( const git_tree *their_tree) { git_iterator *iterators[3] = {0}; - git_index_entry *items[3] = {0}, *best_cur_item, *cur_items[3]; + const git_index_entry *items[3] = {0}, *best_cur_item, *cur_items[3]; git_vector_cmp entry_compare = git_index_entry__cmp; struct merge_diff_df_data df_data = {0}; int cur_item_modified; |