Added new ExternalMerger - Plastic SCM (#1162)

Motivation:
https://m-pixel.com/how-to-use-plastic-scms-merge-tool-with-p4v/
This commit is contained in:
Göran W 2025-04-07 14:22:53 +02:00 committed by GitHub
parent 7fedef396f
commit 1555abd027
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 0 deletions

View file

@ -42,6 +42,7 @@ namespace SourceGit.Models
new ExternalMerger(7, "win_merge", "WinMerge", "WinMergeU.exe", "\"$MERGED\"", "-u -e -sw \"$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\""),
new ExternalMerger(10, "plastic_merge", "Plastic SCM", "mergetool.exe", "-s=\"$REMOTE\" -b=\"$BASE\" -d=\"$LOCAL\" -r=\"$MERGED\" --automatic", "-s=\"$LOCAL\" -d=\"$REMOTE\""),
};
}
else if (OperatingSystem.IsMacOS())

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB