jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

Add MergeTreeSkipREUC and MergeTreeNoRecursive flags to MergeTreeFlag.

This commit is contained in:
Takuji Shimokawa 2020-06-04 17:44:19 +09:00
parent 5241c72e6e
commit 1170bf4097
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
merge.go
View File

@ -126,6 +126,13 @@ const (
// continue resolving conflicts. The merge operation will fail with // continue resolving conflicts. The merge operation will fail with
// GIT_EMERGECONFLICT and no index will be returned. // GIT_EMERGECONFLICT and no index will be returned.
MergeTreeFailOnConflict MergeTreeFlag = C.GIT_MERGE_FAIL_ON_CONFLICT MergeTreeFailOnConflict MergeTreeFlag = C.GIT_MERGE_FAIL_ON_CONFLICT
// Do not write the REUC extension on the generated index
MergeTreeSkipREUC MergeTreeFlag = C.GIT_MERGE_SKIP_REUC
// If the commits being merged have multiple merge bases, do not build
// a recursive merge base (by merging the multiple merge bases),
// instead simply use the first base. This flag provides a similar
// merge base to `git-merge-resolve`.
MergeTreeNoRecursive MergeTreeFlag = C.GIT_MERGE_NO_RECURSIVE
) )
type MergeOptions struct { type MergeOptions struct {