mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-21 22:21:37 +00:00
fixes issues with objective-git
This commit is contained in:
parent
ef6389ad50
commit
917e5fa9a1
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user