diff options
| author | Russell Belfer <rb@github.com> | 2013-09-09 10:30:31 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-09-09 10:30:31 -0700 |
| commit | e0b4a8ac33e9e5903422580bd07938c9bff70e79 (patch) | |
| tree | cb25110f8f8726899d71fcb45e80756420ef64b3 /include/git2 | |
| parent | 4dfe38205b7ddd255c87ff4656720072991fc432 (diff) | |
| parent | 917e5fa9a18b42bb00140db9112e362bc810aa45 (diff) | |
| download | libgit2-e0b4a8ac33e9e5903422580bd07938c9bff70e79.tar.gz | |
Merge pull request #1842 from uh-sem-blee/development
fixes issues with objective-git
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/merge.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index cef6f775b..3f21fb4c8 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -7,11 +7,11 @@ #ifndef INCLUDE_git_merge_h__ #define INCLUDE_git_merge_h__ -#include "git2/common.h" -#include "git2/types.h" -#include "git2/oid.h" -#include "git2/checkout.h" -#include "git2/index.h" +#include "common.h" +#include "types.h" +#include "oid.h" +#include "checkout.h" +#include "index.h" /** * @file git2/merge.h |