C# (CSharp) CWDev.SLNTools.Core.Merge Conflict Examples

Example #1

File: ConflictContext.cs Project: configit-open-source/csmerge

 public ConflictContext CreateSubcontext(Conflict subconflict)
 {
     return new ConflictContext(this, subconflict);
 }

Example #2

 public ConflictContext CreateSubcontext(Conflict subconflict)
 {
     return(new ConflictContext(this, subconflict));
 }

Example #3

File: ConflictContext.cs Project: configit-open-source/csmerge

 private ConflictContext(ConflictContext context, Conflict subconflict)
 {
     r_conflicts = new List<Conflict>(context.r_conflicts) {subconflict};
 }