Skip to content

Commit

Permalink
Provide missing merge flags (#615)
Browse files Browse the repository at this point in the history
This change adds two missing merge flags MergeTreeSkipREUC and MergeTreeNoRecursive.
  • Loading branch information
takuji committed Jun 5, 2020
1 parent 5241c72 commit 33dac3d
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions merge.go
Expand Up @@ -126,6 +126,14 @@ const (
// continue resolving conflicts. The merge operation will fail with
// GIT_EMERGECONFLICT and no index will be returned.
MergeTreeFailOnConflict MergeTreeFlag = C.GIT_MERGE_FAIL_ON_CONFLICT
// MergeTreeSkipREUC specifies not to write the REUC extension on the
// generated index.
MergeTreeSkipREUC MergeTreeFlag = C.GIT_MERGE_SKIP_REUC
// MergeTreeNoRecursive specifies not to build a recursive merge base (by
// merging the multiple merge bases) if the commits being merged have
// multiple merge bases. Instead, the first base is used.
// This flag provides a similar merge base to `git-merge-resolve`.
MergeTreeNoRecursive MergeTreeFlag = C.GIT_MERGE_NO_RECURSIVE
)

type MergeOptions struct {
Expand Down

0 comments on commit 33dac3d

Please sign in to comment.