diff options
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/merge.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index ced9e51ff..b7da63e0e 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -79,6 +79,11 @@ typedef enum { * GIT_EMERGECONFLICT and no index will be returned. */ GIT_MERGE_TREE_FAIL_ON_CONFLICT = (1 << 1), + + /** + * Do not write the REUC extension on the generated index + */ + GIT_MERGE_TREE_SKIP_REUC = (1 << 2), } git_merge_tree_flag_t; /** |