From 661e1a6f1b70a3f4837c4aec6a3006dcc5689bc6 Mon Sep 17 00:00:00 2001 From: Carlos Martín Nieto Date: Thu, 22 Feb 2018 09:46:42 +0100 Subject: merge: expose the conflict marker size option --- merge.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'merge.go') diff --git a/merge.go b/merge.go index bfbf9a3..adc521a 100644 --- 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) { -- cgit v1.2.3