fix: type mismatch error

Author: MikeJerred

libgit2-sys/lib.rs

@@ -1357,7 +1357,7 @@ pub struct git_merge_file_options {
     pub our_label: *const c_char,
     pub their_label: *const c_char,
     pub favor: git_merge_file_favor_t,
-    pub flags: git_merge_file_flag_t,
+    pub flags: u32,
     pub marker_size: c_ushort,
 }
 

src/merge.rs

@@ -282,9 +282,9 @@ impl MergeFileOptions {
 
     fn flag(&mut self, opt: raw::git_merge_file_flag_t, val: bool) -> &mut MergeFileOptions {
         if val {
-            self.raw.flags |= opt;
+            self.raw.flags |= opt as u32;
         } else {
-            self.raw.flags &= !opt;
+            self.raw.flags &= !opt as u32;
         }
         self
     }