From 1170bf409702f14e23ddd36ebfd029eaece36b99 Mon Sep 17 00:00:00 2001 From: Takuji Shimokawa Date: Thu, 4 Jun 2020 17:44:19 +0900 Subject: [PATCH] Add MergeTreeSkipREUC and MergeTreeNoRecursive flags to MergeTreeFlag. --- merge.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/merge.go b/merge.go index 06e98a0..9c804f7 100644 --- a/merge.go +++ b/merge.go @@ -126,6 +126,13 @@ 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 + // 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 {