GitMergeOpts: include default driver

Edward Thomson · Edward Thomson · commit 3aa531fc15c4 · 2016-04-03T17:12:27.000-04:00
diff --git a/LibGit2Sharp/Core/GitMergeOpts.cs b/LibGit2Sharp/Core/GitMergeOpts.cs
@@ -35,6 +35,12 @@ internal struct GitMergeOpts
         /// </summary>
         public uint RecursionLimit;
 
+        /// <summary>
+        /// Default merge driver to be used when both sides of a merge have
+        /// changed.  The default is the `text` driver.
+        /// </summary>
+        public string DefaultDriver;
+
         /// <summary>
         /// Flags for automerging content.
         /// </summary>
