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

merge: expose the conflict marker size option

This commit is contained in:
Carlos Martín Nieto 2018-02-22 09:46:42 +01:00
parent cff71166ec
commit 661e1a6f1b
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
merge.go
View File

@ -355,6 +355,7 @@ type MergeFileOptions struct {
TheirLabel string TheirLabel string
Favor MergeFileFavor Favor MergeFileFavor
Flags MergeFileFlags Flags MergeFileFlags
MarkerSize uint16
} }
func mergeFileOptionsFromC(c C.git_merge_file_options) MergeFileOptions { func mergeFileOptionsFromC(c C.git_merge_file_options) MergeFileOptions {
@ -364,6 +365,7 @@ func mergeFileOptionsFromC(c C.git_merge_file_options) MergeFileOptions {
TheirLabel: C.GoString(c.their_label), TheirLabel: C.GoString(c.their_label),
Favor: MergeFileFavor(c.favor), Favor: MergeFileFavor(c.favor),
Flags: MergeFileFlags(c.flags), Flags: MergeFileFlags(c.flags),
MarkerSize: uint16(c.marker_size),
} }
} }
@ -373,6 +375,7 @@ func populateCMergeFileOptions(c *C.git_merge_file_options, options MergeFileOpt
c.their_label = C.CString(options.TheirLabel) c.their_label = C.CString(options.TheirLabel)
c.favor = C.git_merge_file_favor_t(options.Favor) c.favor = C.git_merge_file_favor_t(options.Favor)
c.flags = C.git_merge_file_flag_t(options.Flags) c.flags = C.git_merge_file_flag_t(options.Flags)
c.marker_size = C.ushort(options.MarkerSize)
} }
func freeCMergeFileOptions(c *C.git_merge_file_options) { func freeCMergeFileOptions(c *C.git_merge_file_options) {