Skip to content

Commit 374b698

Browse files
committed
@ F update diff tools
1 parent 3070326 commit 374b698

4 files changed

Lines changed: 23 additions & 6 deletions

File tree

approvaltests/src/main/java/org/approvaltests/reporters/DiffPrograms.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@ public static class Mac
3232
"/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code", "-d %s %s", TEXT);
3333
public static DiffInfo ARAXIS_MERGE = new DiffInfo(
3434
"/Applications/Araxis Merge.app/Contents/Utilities/compare", TEXT_AND_IMAGE);
35-
public static DiffInfo DIFF_COMMAND_LINE = new DiffInfo("/usr/bin/diff", "-u %s %s", TEXT);
3635
public static DiffInfo SUBLIME_MERGE = new DiffInfo(
3736
"/Applications/Sublime Merge.app/Contents/SharedSupport/bin/smerge", "mergetool %s %s", TEXT);
37+
public static DiffInfo CURSOR = new DiffInfo(
38+
"/Applications/Cursor.app/Contents/Resources/app/bin/code", "-d %s %s", TEXT);
39+
public static DiffInfo DIFF_COMMAND_LINE = new DiffInfo("/usr/bin/diff", "-u %s %s", TEXT);
3840
}
3941
public static class Windows
4042
{
@@ -69,7 +71,7 @@ public static class Linux
6971
public static DiffInfo DIFF_MERGE = new DiffInfo("/usr/bin/diffmerge", "--nosplash %s %s", TEXT);
7072
public static DiffInfo MELD_MERGE = new DiffInfo("/usr/bin/meld", "%s %s", TEXT);
7173
public static DiffInfo KDIFF3 = new DiffInfo("/usr/bin/kdiff3", "%s %s -m", TEXT);
72-
public static DiffInfo DIFF_COMMAND_LINE = new DiffInfo("/usr/bin/diff", "-u %s %s", TEXT);
7374
public static DiffInfo SUBLIME_MERGE = new DiffInfo("/usr/bin/smerge", "mergetool %s %s", TEXT);
75+
public static DiffInfo DIFF_COMMAND_LINE = new DiffInfo("/usr/bin/diff", "-u %s %s", TEXT);
7476
}
7577
}

approvaltests/src/main/java/org/approvaltests/reporters/linux/ReportWithDiffToolOnLinux.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public ReportWithDiffToolOnLinux()
1515
ReportWithDiffMergeLinux.INSTANCE,
1616
ReportWithMeldMergeLinux.INSTANCE,
1717
ReportWithKdiff3Linux.INSTANCE,
18-
ReportWithDiffCommandLineLinux.INSTANCE,
19-
ReportWithSublimeMergeLinux.INSTANCE
18+
ReportWithSublimeMergeLinux.INSTANCE,
19+
ReportWithDiffCommandLineLinux.INSTANCE
2020
// end-snippet
2121
// @formatter:on
2222
);
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Generated from diff_reporters.csv -- do not edit manually.
2+
package org.approvaltests.reporters.macosx;
3+
4+
import org.approvaltests.reporters.DiffPrograms.Mac;
5+
import org.approvaltests.reporters.GenericDiffReporter;
6+
7+
public class ReportWithCursorMac extends GenericDiffReporter
8+
{
9+
public static final ReportWithCursorMac INSTANCE = new ReportWithCursorMac();
10+
public ReportWithCursorMac()
11+
{
12+
super(Mac.CURSOR);
13+
}
14+
}

approvaltests/src/main/java/org/approvaltests/reporters/macosx/ReportWithDiffToolOnMac.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ public ReportWithDiffToolOnMac()
2222
ReportWithTkDiffMac.INSTANCE,
2323
ReportWithVisualStudioCodeMac.INSTANCE,
2424
ReportWithAraxisMergeMac.INSTANCE,
25-
ReportWithDiffCommandLineMac.INSTANCE,
26-
ReportWithSublimeMergeMac.INSTANCE
25+
ReportWithSublimeMergeMac.INSTANCE,
26+
ReportWithCursorMac.INSTANCE,
27+
ReportWithDiffCommandLineMac.INSTANCE
2728
// end-snippet
2829
// @formatter:on
2930
);

0 commit comments

Comments
 (0)