summaryrefslogtreecommitdiff
path: root/merge.go
diff options
context:
space:
mode:
Diffstat (limited to 'merge.go')
-rw-r--r--merge.go2
1 files changed, 0 insertions, 2 deletions
diff --git a/merge.go b/merge.go
index a8e7d6e..6e7d581 100644
--- a/merge.go
+++ b/merge.go
@@ -138,7 +138,6 @@ const (
)
type MergeOptions struct {
- Version uint
TreeFlags MergeTreeFlag
RenameThreshold uint
@@ -151,7 +150,6 @@ type MergeOptions struct {
func mergeOptionsFromC(opts *C.git_merge_options) MergeOptions {
return MergeOptions{
- Version: uint(opts.version),
TreeFlags: MergeTreeFlag(opts.flags),
RenameThreshold: uint(opts.rename_threshold),
TargetLimit: uint(opts.target_limit),