diff options
| author | Vicent Martà <tanoku@gmail.com> | 2012-04-13 20:41:06 +0200 |
|---|---|---|
| committer | Vicent Martà <tanoku@gmail.com> | 2012-04-13 20:41:06 +0200 |
| commit | d1f331564da9d6110b80b538a501da0c66e59142 (patch) | |
| tree | 9104d99cb3cafcdf7142ba14d5fe6380c42ccdea /include/git2.h | |
| parent | fcb2164ff1a0ab0eab22e08cefa87880590bdbbf (diff) | |
| parent | eb8117b841f22063ba8fe27653cac79957c548ea (diff) | |
| download | libgit2-d1f331564da9d6110b80b538a501da0c66e59142.tar.gz | |
Merge remote-tracking branch 'carlosmn/revwalk-merge-base' into new-error-handling
Diffstat (limited to 'include/git2.h')
| -rw-r--r-- | include/git2.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/git2.h b/include/git2.h index 7d053c4af..d75387318 100644 --- a/include/git2.h +++ b/include/git2.h @@ -22,6 +22,7 @@ #include "git2/repository.h" #include "git2/revwalk.h" +#include "git2/merge.h" #include "git2/refs.h" #include "git2/reflog.h" |