We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 0901a16 commit 3aa531fCopy full SHA for 3aa531f
LibGit2Sharp/Core/GitMergeOpts.cs
@@ -35,6 +35,12 @@ internal struct GitMergeOpts
35
/// </summary>
36
public uint RecursionLimit;
37
38
+ /// <summary>
39
+ /// Default merge driver to be used when both sides of a merge have
40
+ /// changed. The default is the `text` driver.
41
+ /// </summary>
42
+ public string DefaultDriver;
43
+
44
/// <summary>
45
/// Flags for automerging content.
46
0 commit comments