Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions src/Assent/Reporters/DiffPrograms/WinMergeDiffProgram.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
using System.Collections.Generic;
using System.Linq;

namespace Assent.Reporters.DiffPrograms
{
public class WinMergeDiffProgram : DiffProgramBase
{
static WinMergeDiffProgram()
{
DefaultSearchPaths = WindowsProgramFilePaths
.Select(p => $@"{p}\WinMerge\WinMergeU.exe")
.ToArray();
}

public static readonly IReadOnlyList<string> DefaultSearchPaths;

public WinMergeDiffProgram() : base(DefaultSearchPaths)
{

}

public WinMergeDiffProgram(IReadOnlyList<string> searchPaths)
: base(searchPaths)
{
}
}
}
3 changes: 2 additions & 1 deletion src/Assent/Reporters/DiffReporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ static DiffReporter()
? new IDiffProgram[]
{
new BeyondCompareDiffProgram(),
new WinMergeDiffProgram(),
new KDiff3DiffProgram(),
new XdiffDiffProgram(),
new P4MergeDiffProgram(),
new P4MergeDiffProgram(),
new VsCodeDiffProgram()
}
: new IDiffProgram[]
Expand Down