Meziantou.FrameworkTextMergeOptions Class
Options of TextMerge.Merge.
public sealed class TextMergeOptionsConstructors
| Name | Description |
|---|---|
| TextMergeOptions() |
TextMergeOptions()
TextMergeOptions.cspublic TextMergeOptions()No documentation is available.
Properties
| Name | Description |
|---|---|
| BaseLabel | Gets or sets the label written after the ||||||| marker. Defaults to "base". |
| ConflictStyle | Gets or sets how TextMergeResult.Text writes the conflicts. Defaults to TextMergeConflictStyle.Merge. |
| DiffOptions | Gets or sets the options of the diffs between the base and each side: the chunker, the algorithm, the comparison options and the time limit. Defaults to null: a line diff with the default options. |
| OursLabel | Gets or sets the label written after the <<<<<<< marker. Defaults to "ours". |
| TheirsLabel | Gets or sets the label written after the >>>>>>> marker. Defaults to "theirs". |
BaseLabel
TextMergeOptions.csConflictStyle
TextMergeOptions.csGets or sets how TextMergeResult.Text writes the conflicts. Defaults to TextMergeConflictStyle.Merge.
public TextMergeConflictStyle ConflictStyle { get; set; }Property value
DiffOptions
TextMergeOptions.csGets or sets the options of the diffs between the base and each side: the chunker, the algorithm, the comparison options and the time limit. Defaults to null: a line diff with the default options.
public TextDiffOptions? DiffOptions { get; set; }