Skip to content

Commit

Permalink
! B Fixing missing approval file
Browse files Browse the repository at this point in the history
  • Loading branch information
ScottBob committed Oct 5, 2023
1 parent c2f2cab commit 349d8dd
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hello Approvals
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@ public static class Linux
public static DiffInfo DIFF_MERGE = new DiffInfo("/usr/bin/diffmerge", "--nosplash %s %s ", TEXT);
public static DiffInfo MELD_MERGE = new DiffInfo(One.of("/usr/bin/meld", "/usr/local/bin/meld"), "%s %s ",
TEXT);
public static DiffInfo KDIFF3 = new DiffInfo("/usr/bin/kdiff3", "%s %s -m", TEXT);
public static DiffInfo KDIFF3 = new DiffInfo("/usr/bin/kdiff3", "%s %s -m", TEXT);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
import org.approvaltests.reporters.macosx.KDiff3MacReporter;
import org.approvaltests.reporters.windows.KDiff3WindowsReporter;

public class KDiff3Reporter extends FirstWorkingReporter {
public static final KDiff3Reporter INSTANCE = new KDiff3Reporter();
public KDiff3Reporter() {
super(KDiff3MacReporter.INSTANCE, KDiff3WindowsReporter.INSTANCE, KDiff3LinuxReporter.INSTANCE);
}
public class KDiff3Reporter extends FirstWorkingReporter
{
public static final KDiff3Reporter INSTANCE = new KDiff3Reporter();
public KDiff3Reporter()
{
super(KDiff3MacReporter.INSTANCE, KDiff3WindowsReporter.INSTANCE, KDiff3LinuxReporter.INSTANCE);
}
}

0 comments on commit 349d8dd

Please sign in to comment.