summaryrefslogtreecommitdiff
path: root/src/merge.c
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2013-04-30 17:33:11 -0500
committerEdward Thomson <ethomson@edwardthomson.com>2013-04-30 17:33:11 -0500
commit75d1c8c664eba0ddef802b1bf6d1327707014c6e (patch)
tree84d8f03f7bd2e684adbc65cff6398891c58b08e8 /src/merge.c
parent0462fba538b380551cbd5d8c05281352ba7a7471 (diff)
downloadlibgit2-75d1c8c664eba0ddef802b1bf6d1327707014c6e.tar.gz
move NAME and REUC extensions to sys/
Diffstat (limited to 'src/merge.c')
-rw-r--r--src/merge.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/merge.c b/src/merge.c
index 681f302f4..3595eb058 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -36,6 +36,7 @@
#include "git2/signature.h"
#include "git2/config.h"
#include "git2/tree.h"
+#include "git2/sys/index.h"
#define GIT_MERGE_INDEX_ENTRY_EXISTS(X) ((X).mode != 0)