diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-04-01 22:16:21 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2013-04-30 15:31:31 -0500 |
| commit | bec65a5e994bc4701216c9ca2c7dae83770b3edc (patch) | |
| tree | 1e941e76b80245dcfb4853d7c6dc231c7aab7699 /include/git2/index.h | |
| parent | 5e2261aca86310aa180eab5ccdc345b1539b024d (diff) | |
| download | libgit2-bec65a5e994bc4701216c9ca2c7dae83770b3edc.tar.gz | |
merge!
Diffstat (limited to 'include/git2/index.h')
| -rw-r--r-- | include/git2/index.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/git2/index.h b/include/git2/index.h index 3d4bd15a8..fcfe4be3d 100644 --- a/include/git2/index.h +++ b/include/git2/index.h @@ -551,9 +551,9 @@ GIT_EXTERN(const git_index_reuc_entry *) git_index_reuc_get_byindex(git_index *i * @return 0 or an error code */ GIT_EXTERN(int) git_index_reuc_add(git_index *index, const char *path, - int ancestor_mode, git_oid *ancestor_id, - int our_mode, git_oid *our_id, - int their_mode, git_oid *their_id); + int ancestor_mode, const git_oid *ancestor_id, + int our_mode, const git_oid *our_id, + int their_mode, const git_oid *their_id); /** * Remove an resolve undo entry from the index |