public override Difference Resolve( ConflictContext context, OperationTypeConflictResolver operationTypeConflictResolver, ValueConflictResolver valueConflictResolver) { return(operationTypeConflictResolver(context.CreateSubcontext(this), r_differenceInSourceBranch, r_differenceInDestinationBranch)); }
public override Difference Resolve( ConflictContext context, OperationTypeConflictResolver operationTypeConflictResolver, ValueConflictResolver valueConflictResolver) { return operationTypeConflictResolver(context.CreateSubcontext(this), r_differenceInSourceBranch, r_differenceInDestinationBranch); }