Summary
Rather than attempting to merge files that were modified on both branches,
it marks them as unresolved. The
resolve
command must be used to resolve these conflicts.
- Assembly
- Mercurial
.Net .dll - Namespace
- Mercurial
- Containing Type
- MergeTools
Syntax
public const string InternalFail
Constant Value
Value | Type |
---|---|
internal:fail | String |