Merge 408ece148e into f4618afee6

feature: switch WinMerge from 3-way to 2-way UI (#712 )
2024-12-25 21:07:20 -08:00 · 2024-11-18 09:10:51 +08:00 · 2024-11-18 09:03:27 +08:00
1 changed files with 1 additions and 1 deletions
--- a/src/Models/ExternalMerger.cs
+++ b/src/Models/ExternalMerger.cs
@ -39,7 +39,7 @@ namespace SourceGit.Models
                    new ExternalMerger(4, "tortoise_merge", "Tortoise Merge", "TortoiseMerge.exe;TortoiseGitMerge.exe", "-base:\"$BASE\" -theirs:\"$REMOTE\" -mine:\"$LOCAL\" -merged:\"$MERGED\"", "-base:\"$LOCAL\" -theirs:\"$REMOTE\""),
                    new ExternalMerger(5, "kdiff3", "KDiff3", "kdiff3.exe", "\"$REMOTE\" -b \"$BASE\" \"$LOCAL\" -o \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
                    new ExternalMerger(6, "beyond_compare", "Beyond Compare", "BComp.exe", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
-                    new ExternalMerger(7, "win_merge", "WinMerge", "WinMergeU.exe", "-u -e \"$REMOTE\" \"$LOCAL\" \"$MERGED\"", "-u -e \"$LOCAL\" \"$REMOTE\""),
+                    new ExternalMerger(7, "win_merge", "WinMerge", "WinMergeU.exe", "\"$MERGED\"", "-u -e \"$LOCAL\" \"$REMOTE\""),
                    new ExternalMerger(8, "codium", "VSCodium", "VSCodium.exe", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""),
                    new ExternalMerger(9, "p4merge", "P4Merge", "p4merge.exe", "-tw 4 \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"", "-tw 4 \"$LOCAL\" \"$REMOTE\""),
                };
Author	SHA1	Message	Date
Göran W	7f54d72542	Merge `408ece148e` into `f4618afee6`	2024-11-18 09:10:51 +08:00
Dmitrij D. Czarkoff	f4618afee6	feature: switch WinMerge from 3-way to 2-way UI (#712 ) Some checks are pending Continuous Integration / Build (push) Waiting to run Details Continuous Integration / Package (push) Blocked by required conditions Details Continuous Integration / Prepare version string (push) Waiting to run Details	2024-11-18 09:03:27 +08:00