Skip to content

Commit 07d4393

Browse files
committed
.
1 parent c1bcb53 commit 07d4393

File tree

5 files changed

+11
-3
lines changed

5 files changed

+11
-3
lines changed

docs/diff-tool.order.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ For example `VisualStudio,Meld` will result in VisualStudio then Meld then all o
5151
```cs
5252
DiffTools.UseOrder(DiffTool.VisualStudio, DiffTool.AraxisMerge);
5353
```
54-
<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L183-L187' title='Snippet source file'>snippet source</a> | <a href='#snippet-UseOrder' title='Start of snippet'>anchor</a></sup>
54+
<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L188-L192' title='Snippet source file'>snippet source</a> | <a href='#snippet-UseOrder' title='Start of snippet'>anchor</a></sup>
5555
<!-- endSnippet -->

src/DiffEngine.Tests/DiffToolsTest.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,11 @@ static async Task AddToolAndLaunch()
115115

116116
#endregion
117117
}
118+
[Fact]
119+
public Task LaunchSpecificBinaryDiff() =>
120+
DiffRunner.LaunchAsync(DiffTool.ExamDiff,
121+
Path.Combine(SourceDirectory, "input.temp.bin"),
122+
Path.Combine(SourceDirectory, "input.target.bin"));
118123
/**
119124
120125
[Fact]

src/DiffEngine/Implementation/BeyondCompare.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ static string RightOsxLinuxArguments(string temp, string target) =>
2727
RequiresTarget: true,
2828
BinaryExtensions:
2929
[
30+
".bin",
3031
".svg",
3132
".pdf",
3233
".bmp",
@@ -91,7 +92,7 @@ static string RightOsxLinuxArguments(string temp, string target) =>
9192
Notes: """
9293
* [Command line reference](https://www.scootersoftware.com/v4help/index.html?command_line_reference.html)
9394
* Enable [Automatically reload unless changes will be discarded](https://www.scootersoftware.com/v4help/optionstweak.html) in `Tools > Options > Tweaks > File Operations`.
94-
* For `.kmz`, and `.nupkg`, Beyond Compare needs to be configured to treat them as zip.
95+
* For `.kmz`, and `.nupkg`, Beyond Compare needs to be configured to treat them as zip.
9596
`Tools > Options > Archive Types`. Scroll down to Zip, then add extra extension to the semicolon delimited list.
9697
""");
9798
}

src/DiffEngine/Implementation/Kaleidoscope.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ public static Definition Kaleidoscope() =>
2020
".jpeg",
2121
".png",
2222
".tiff",
23-
".tif"
23+
".tif",
24+
".bin"
2425
],
2526
OsSupport: new(
2627
Osx: new(

src/DiffEngine/Implementation/WinMerge.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ static string RightArguments(string temp, string target)
2727
Cost: "Free with option to donate",
2828
BinaryExtensions:
2929
[
30+
".bin",
3031
".svg",
3132
".bmp",
3233
".cut",

0 commit comments

Comments
 (0)