LocalAppData for winmerge

fixes #264
VerifyTests · Nov 27, 2021 · 3e59da9 · 3e59da9
1 parent c88f966
commit 3e59da9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/docs/diff-tool.md b/docs/diff-tool.md
@@ -583,6 +583,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
    * `%ProgramFiles%\WinMerge\WinMergeU.exe`
    * `%ProgramW6432%\WinMerge\WinMergeU.exe`
    * `%ProgramFiles(x86)%\WinMerge\WinMergeU.exe`
+   * `%LocalAppData%\Programs\WinMerge\WinMergeU.exe`
 
 
 ## MDI tools

diff --git a/src/DiffEngine.Tests/diffTools.include.md b/src/DiffEngine.Tests/diffTools.include.md
@@ -472,6 +472,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
    * `%ProgramFiles%\WinMerge\WinMergeU.exe`
    * `%ProgramW6432%\WinMerge\WinMergeU.exe`
    * `%ProgramFiles(x86)%\WinMerge\WinMergeU.exe`
+   * `%LocalAppData%\Programs\WinMerge\WinMergeU.exe`
 
 
 ## MDI tools

diff --git a/src/DiffEngine/Implementation/WinMerge.cs b/src/DiffEngine/Implementation/WinMerge.cs
@@ -30,7 +30,8 @@ static string TargetRightArguments(string temp, string target)
             windows: new(
                 TargetLeftArguments,
                 TargetRightArguments,
-                @"%ProgramFiles%\WinMerge\WinMergeU.exe"),
+                @"%ProgramFiles%\WinMerge\WinMergeU.exe",
+                @"%LocalAppData%\Programs\WinMerge\WinMergeU.exe"),
             notes: @"
  * [Command line reference](https://manual.winmerge.org/en/Command_line.html).
  * `/u` Prevents WinMerge from adding paths to the Most Recently Used (MRU) list.