Skip to content

G
git2
Commit e0b4a8ac by Russell Belfer
Options

Merge pull request #1842 from uh-sem-blee/development 

fixes issues with objective-git
parents 4dfe3820 917e5fa9
Showing with 5 additions and 5 deletions
include/git2/merge.h
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
#ifndef INCLUDE_git_merge_h__ #ifndef INCLUDE_git_merge_h__
#define INCLUDE_git_merge_h__ #define INCLUDE_git_merge_h__
#include "git2/common.h" #include "common.h"
#include "git2/types.h" #include "types.h"
#include "git2/oid.h" #include "oid.h"
#include "git2/checkout.h" #include "checkout.h"
#include "git2/index.h" #include "index.h"
/** /**
* @file git2/merge.h * @file git2/merge.h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment