コード例 #1
0
 public override Difference Resolve(
     ConflictContext context,
     OperationTypeConflictResolver operationTypeConflictResolver,
     ValueConflictResolver valueConflictResolver)
 {
     return(operationTypeConflictResolver(context.CreateSubcontext(this), r_differenceInSourceBranch, r_differenceInDestinationBranch));
 }
コード例 #2
0
 public override Difference Resolve(
             ConflictContext context,
             OperationTypeConflictResolver operationTypeConflictResolver,
             ValueConflictResolver valueConflictResolver)
 {
     return operationTypeConflictResolver(context.CreateSubcontext(this), r_differenceInSourceBranch, r_differenceInDestinationBranch);
 }