Skip to content

Fix winmerge left/right #301

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

Merged
merged 4 commits into from
Oct 27, 2022
Merged

Fix winmerge left/right #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e01b9bc
.
SimonCropp Oct 27, 2022
40e8e08
Update WinMerge.cs
SimonCropp Oct 27, 2022
828e07b
.
SimonCropp Oct 27, 2022
31019c5
Merge branch 'main' into fix-winmerge-left/right-
SimonCropp Oct 27, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/diff-tool.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a

#### Windows settings:

* Example target on left arguments: `/u /wl /e "targetFile.txt" "tempFile.txt" /dl "targetFile.txt" /dr "tempFile.txt" `
* Example target on left arguments: `/u /wr /e "targetFile.txt" "tempFile.txt" /dl "targetFile.txt" /dr "tempFile.txt" `
* Example target on right arguments: `/u /wl /e "tempFile.txt" "targetFile.txt" /dl "tempFile.txt" /dr "targetFile.txt" `
* Scanned paths:
* `%PATH%WinMergeU.exe`
Expand Down
2 changes: 1 addition & 1 deletion docs/diff-tool.order.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@ For example `VisualStudio,Meld` will result in VisualStudio then Meld then all o
```cs
DiffTools.UseOrder(DiffTool.VisualStudio, DiffTool.AraxisMerge);
```
<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L128-L130' title='Snippet source file'>snippet source</a> | <a href='#snippet-useorder' title='Start of snippet'>anchor</a></sup>
<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L134-L136' title='Snippet source file'>snippet source</a> | <a href='#snippet-useorder' title='Start of snippet'>anchor</a></sup>
<!-- endSnippet -->
8 changes: 7 additions & 1 deletion src/DiffEngine.Tests/DiffToolsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,13 @@ async Task AddToolAndLaunch()
// Path.Combine(SourceDirectory, "input.target.txt"));
// }
//}

/**
[Fact]
public Task LaunchSpecificTextDiff() =>
DiffRunner.LaunchAsync(DiffTool.WinMerge,
Path.Combine(SourceDirectory, "input.temp.txt"),
Path.Combine(SourceDirectory, "input.target.txt"));
**/
#if DEBUG
[Fact]
public void ChangeOrder()
Expand Down
2 changes: 1 addition & 1 deletion src/DiffEngine.Tests/diffTools.include.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a

#### Windows settings:

* Example target on left arguments: `/u /wl /e "targetFile.txt" "tempFile.txt" /dl "targetFile.txt" /dr "tempFile.txt" `
* Example target on left arguments: `/u /wr /e "targetFile.txt" "tempFile.txt" /dl "targetFile.txt" /dr "tempFile.txt" `
* Example target on right arguments: `/u /wl /e "tempFile.txt" "targetFile.txt" /dl "tempFile.txt" /dr "targetFile.txt" `
* Scanned paths:
* `%PATH%WinMergeU.exe`
Expand Down
2 changes: 1 addition & 1 deletion src/DiffEngine/Implementation/WinMerge.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ static string LeftArguments(string temp, string target)
{
var tempTitle = Path.GetFileName(temp);
var targetTitle = Path.GetFileName(target);
return $"/u /wl /e \"{target}\" \"{temp}\" /dl \"{targetTitle}\" /dr \"{tempTitle}\"";
return $"/u /wr /e \"{target}\" \"{temp}\" /dl \"{targetTitle}\" /dr \"{tempTitle}\"";
}

static string RightArguments(string temp, string target)
Expand Down