Summary
Attempt to resolve conflicts in a .rej file.
- Assembly
- Mercurial
.Net .dll - Namespace
- Mercurial
.Gui - Containing Type
- GuiClient
Syntax
public static void MPatchGui(this Repository repository, string file, MPatchGuiCommand command = null)Parameters
| Name | Type | Description |
|---|---|---|
| repository | Repository |
The Repository to resolve conflicts in.
|
| file | string | The file to resolve conflicts in. |
| command | MPatchGuiCommand |
Any extra options to the mpatch method, or null for default options.
|
Return Value
| Type | Description |
|---|---|
| void |