summaryrefslogtreecommitdiff
path: root/src/merge.c
diff options
context:
space:
mode:
authorVicent Marti <tanoku@gmail.com>2014-10-01 12:03:24 +0200
committerVicent Marti <tanoku@gmail.com>2014-10-01 12:03:24 +0200
commit737b505116f263653ef4f0c80d888b1a87187a2b (patch)
tree9c3706135bd9d4d79b8aca5f067f595adf9e91e4 /src/merge.c
parent5451754d4604daf88abb2069b061be402b3839a7 (diff)
downloadlibgit2-vmg/hashsig.tar.gz
hashsig: Export as a `sys` headervmg/hashsig
Diffstat (limited to 'src/merge.c')
-rw-r--r--src/merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c
index ddeea8752..1e72520a4 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -22,7 +22,6 @@
#include "tree.h"
#include "merge_file.h"
#include "blob.h"
-#include "hashsig.h"
#include "oid.h"
#include "index.h"
#include "filebuf.h"
@@ -42,6 +41,7 @@
#include "git2/tree.h"
#include "git2/oidarray.h"
#include "git2/sys/index.h"
+#include "git2/sys/hashsig.h"
#define GIT_MERGE_INDEX_ENTRY_EXISTS(X) ((X).mode != 0)
#define GIT_MERGE_INDEX_ENTRY_ISFILE(X) S_ISREG((X).mode)