diff options
| author | Vicent Marti <tanoku@gmail.com> | 2015-10-27 22:42:15 +0100 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2015-10-27 22:44:26 +0100 |
| commit | a1f5d691a2bcaa83f60500b98ce5f393e7c03ad9 (patch) | |
| tree | 74e7daf654b26b5fc01db7d2fd63dcc0a5cb92e8 /include/git2/merge.h | |
| parent | d307a0134b97475abb03d0365458c318ba817f95 (diff) | |
| download | libgit2-a1f5d691a2bcaa83f60500b98ce5f393e7c03ad9.tar.gz | |
merge: Implement `GIT_MERGE_TREE_SKIP_REUC`
Diffstat (limited to 'include/git2/merge.h')
| -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; /** |