diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-01-03 22:44:09 +0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2013-01-04 02:35:59 +0400 |
| commit | 42e50b5ed10fcebab794d35cefa1eedcd79072b6 (patch) | |
| tree | bf7f56bda58b5be43edf2f2ba2ea31aa49a51311 /src/merge.h | |
| parent | b449a9ae8c9ac17652c5ab006859dd29b62a5b48 (diff) | |
MERGE_HEAD contents iterator
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/merge.h b/src/merge.h index af24de474..03b41e388 100644 --- a/src/merge.h +++ b/src/merge.h @@ -10,6 +10,7 @@ #include "git2/types.h" #include "git2/merge.h" #include "commit_list.h" +#include "vector.h" #define GIT_MERGE_MSG_FILE "MERGE_MSG" #define GIT_MERGE_MODE_FILE "MERGE_MODE" |