Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix araxis on mac #81

Merged
merged 3 commits into from
Apr 8, 2020
Merged

Fix araxis on mac #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38ca955
Update AraxisMerge.cs
SimonCropp Apr 8, 2020
0b3f46d
Merge branch 'master' into fixAraxisOnMac
SimonCropp Apr 8, 2020
a48d469
.
SimonCropp Apr 8, 2020
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
184 changes: 89 additions & 95 deletions docs/diff-tool.md
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 7 additions & 10 deletions src/DiffEngine.Tests/DiffToolsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ public void WriteFoundTools()
## [{tool.Name}]({tool.Url})");

writer.WriteLine($@"
* IsMdi: {tool.IsMdi}
* SupportsAutoRefresh: {tool.SupportsAutoRefresh}");
* Is MDI: {tool.IsMdi}
* Supports auto-refresh: {tool.SupportsAutoRefresh}
* Supports text files: {tool.SupportsText}");

if (tool.Notes != null)
{
Expand All @@ -47,7 +48,7 @@ public void WriteFoundTools()
### Windows settings:
");
writer.WriteLine($@"
**Example arguments:** `{tool.BuildWindowsArguments("tempFile", "targetFile")}`");
**Example arguments:** `{tool.BuildWindowsArguments!("tempFile", "targetFile")}`");

writer.WriteLine(@"
**Scanned paths:**
Expand All @@ -61,10 +62,10 @@ public void WriteFoundTools()
if (tool.OsxExePaths.Any())
{
writer.WriteLine(@"
### Osx settings:
### OSX settings:
");
writer.WriteLine($@"
**Example arguments:** `{tool.BuildOsxArguments("tempFile", "targetFile")}`");
**Example arguments:** `{tool.BuildOsxArguments!("tempFile", "targetFile")}`");

writer.WriteLine(@"
**Scanned paths:**
Expand All @@ -81,7 +82,7 @@ public void WriteFoundTools()
### Linux settings:
");
writer.WriteLine($@"
**Example arguments:** `{tool.BuildLinuxArguments("tempFile", "targetFile")}`");
**Example arguments:** `{tool.BuildLinuxArguments!("tempFile", "targetFile")}`");

writer.WriteLine(@"
**Scanned paths:**
Expand All @@ -92,10 +93,6 @@ public void WriteFoundTools()
}
}

writer.WriteLine($@"
### Supported Text files: {tool.SupportsText}
");

if (tool.BinaryExtensions.Any())
{
writer.WriteLine(@"
Expand Down
Loading