Skip to content

Commit 3db80db

Browse files
authored
Fix winmerge left/right (#301)
1 parent 7f5b205 commit 3db80db

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

docs/diff-tool.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
600600

601601
#### Windows settings:
602602

603-
* Example target on left arguments: `/u /wl /e "targetFile.txt" "tempFile.txt" /dl "targetFile.txt" /dr "tempFile.txt" `
603+
* Example target on left arguments: `/u /wr /e "targetFile.txt" "tempFile.txt" /dl "targetFile.txt" /dr "tempFile.txt" `
604604
* Example target on right arguments: `/u /wl /e "tempFile.txt" "targetFile.txt" /dl "tempFile.txt" /dr "targetFile.txt" `
605605
* Scanned paths:
606606
* `%PATH%WinMergeU.exe`

docs/diff-tool.order.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ For example `VisualStudio,Meld` will result in VisualStudio then Meld then all o
5353
```cs
5454
DiffTools.UseOrder(DiffTool.VisualStudio, DiffTool.AraxisMerge);
5555
```
56-
<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>
56+
<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>
5757
<!-- endSnippet -->

src/DiffEngine.Tests/DiffToolsTest.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,13 @@ async Task AddToolAndLaunch()
120120
// Path.Combine(SourceDirectory, "input.target.txt"));
121121
// }
122122
//}
123-
123+
/**
124+
[Fact]
125+
public Task LaunchSpecificTextDiff() =>
126+
DiffRunner.LaunchAsync(DiffTool.WinMerge,
127+
Path.Combine(SourceDirectory, "input.temp.txt"),
128+
Path.Combine(SourceDirectory, "input.target.txt"));
129+
**/
124130
#if DEBUG
125131
[Fact]
126132
public void ChangeOrder()

src/DiffEngine.Tests/diffTools.include.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
489489

490490
#### Windows settings:
491491

492-
* Example target on left arguments: `/u /wl /e "targetFile.txt" "tempFile.txt" /dl "targetFile.txt" /dr "tempFile.txt" `
492+
* Example target on left arguments: `/u /wr /e "targetFile.txt" "tempFile.txt" /dl "targetFile.txt" /dr "tempFile.txt" `
493493
* Example target on right arguments: `/u /wl /e "tempFile.txt" "targetFile.txt" /dl "tempFile.txt" /dr "targetFile.txt" `
494494
* Scanned paths:
495495
* `%PATH%WinMergeU.exe`

src/DiffEngine/Implementation/WinMerge.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ static string LeftArguments(string temp, string target)
66
{
77
var tempTitle = Path.GetFileName(temp);
88
var targetTitle = Path.GetFileName(target);
9-
return $"/u /wl /e \"{target}\" \"{temp}\" /dl \"{targetTitle}\" /dr \"{tempTitle}\"";
9+
return $"/u /wr /e \"{target}\" \"{temp}\" /dl \"{targetTitle}\" /dr \"{tempTitle}\"";
1010
}
1111

1212
static string RightArguments(string temp, string target)

0 commit comments

Comments
 (0)