Summary
Mark the file as resolved or unresolved, or attempt to redo the merge.
- Assembly
- Mercurial
.Net .dll - Namespace
- Mercurial
- Containing Type
- Repository
Syntax
public void Resolve(string file, ResolveAction action, ResolveCommand command = null)Parameters
| Name | Type | Description |
|---|---|---|
| file | string | The file to process. |
| action | ResolveAction | Which action to take for the file. |
| command | ResolveCommand |
Any extra options to the resolve method, or null for default options.
|
Return Value
| Type | Description |
|---|---|
| void |