Skip to content

Commit 927f0c3

Browse files
authored
Merge pull request #29 from richev-o/richev/adding-winmerge-diff-program
Added WinMerge support.
2 parents 90b2460 + f1b5fd7 commit 927f0c3

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
using System.Collections.Generic;
2+
using System.Linq;
3+
4+
namespace Assent.Reporters.DiffPrograms
5+
{
6+
public class WinMergeDiffProgram : DiffProgramBase
7+
{
8+
static WinMergeDiffProgram()
9+
{
10+
DefaultSearchPaths = WindowsProgramFilePaths
11+
.Select(p => $@"{p}\WinMerge\WinMergeU.exe")
12+
.ToArray();
13+
}
14+
15+
public static readonly IReadOnlyList<string> DefaultSearchPaths;
16+
17+
public WinMergeDiffProgram() : base(DefaultSearchPaths)
18+
{
19+
20+
}
21+
22+
public WinMergeDiffProgram(IReadOnlyList<string> searchPaths)
23+
: base(searchPaths)
24+
{
25+
}
26+
}
27+
}

src/Assent/Reporters/DiffReporter.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ static DiffReporter()
1919
? new IDiffProgram[]
2020
{
2121
new BeyondCompareDiffProgram(),
22+
new WinMergeDiffProgram(),
2223
new KDiff3DiffProgram(),
2324
new XdiffDiffProgram(),
24-
new P4MergeDiffProgram(),
25+
new P4MergeDiffProgram(),
2526
new VsCodeDiffProgram()
2627
}
2728
: new IDiffProgram[]

0 commit comments

Comments
 (0)