merge: expose the conflict marker size option

carlosmn · carlosmn · commit 661e1a6f1b70 · 2018-02-22T09:46:42.000+01:00
diff --git a/merge.go b/merge.go
@@ -355,6 +355,7 @@ type MergeFileOptions struct {
 	TheirLabel    string
 	Favor         MergeFileFavor
 	Flags         MergeFileFlags
+	MarkerSize    uint16
 }
 
 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),
 		Favor:         MergeFileFavor(c.favor),
 		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.favor = C.git_merge_file_favor_t(options.Favor)
 	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) {

Original file line number	Diff line number	Diff line change
`@@ -355,6 +355,7 @@ type MergeFileOptions struct {`
`355`	`355`	`TheirLabel string`
`356`	`356`	`Favor MergeFileFavor`
`357`	`357`	`Flags MergeFileFlags`
	`358`	`+ MarkerSize uint16`
`358`	`359`	`}`
`359`	`360`
`360`	`361`	`func mergeFileOptionsFromC(c C.git_merge_file_options) MergeFileOptions {`
`@@ -364,6 +365,7 @@ func mergeFileOptionsFromC(c C.git_merge_file_options) MergeFileOptions {`
`364`	`365`	`TheirLabel: C.GoString(c.their_label),`
`365`	`366`	`Favor: MergeFileFavor(c.favor),`
`366`	`367`	`Flags: MergeFileFlags(c.flags),`
	`368`	`+ MarkerSize: uint16(c.marker_size),`
`367`	`369`	`}`
`368`	`370`	`}`
`369`	`371`
`@@ -373,6 +375,7 @@ func populateCMergeFileOptions(c *C.git_merge_file_options, options MergeFileOpt`
`373`	`375`	`c.their_label = C.CString(options.TheirLabel)`
`374`	`376`	`c.favor = C.git_merge_file_favor_t(options.Favor)`
`375`	`377`	`c.flags = C.git_merge_file_flag_t(options.Flags)`
	`378`	`+ c.marker_size = C.ushort(options.MarkerSize)`
`376`	`379`	`}`
`377`	`380`
`378`	`381`	`func freeCMergeFileOptions(c *C.git_merge_file_options) {`