proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-12-30 22:59:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
fixes issues with objective-git
This commit is contained in:
Russell Belfer 2013-09-09 10:30:31 -07:00
commit e0b4a8ac33
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/git2/merge.h
View File

@ -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