diff options
author | Vicent Marti <tanoku@gmail.com> | 2014-10-01 12:03:24 +0200 |
---|---|---|
committer | Vicent Marti <tanoku@gmail.com> | 2014-10-01 12:03:24 +0200 |
commit | 737b505116f263653ef4f0c80d888b1a87187a2b (patch) | |
tree | 9c3706135bd9d4d79b8aca5f067f595adf9e91e4 /src/merge.c | |
parent | 5451754d4604daf88abb2069b061be402b3839a7 (diff) | |
download | libgit2-vmg/hashsig.tar.gz |
hashsig: Export as a `sys` headervmg/hashsig
Diffstat (limited to 'src/merge.c')
-rw-r--r-- | src/merge.c | 2 |
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) |