Skip to content

Commit 1555abd

Browse files
authored
Added new ExternalMerger - Plastic SCM (#1162)
Motivation: https://m-pixel.com/how-to-use-plastic-scms-merge-tool-with-p4v/
1 parent 7fedef3 commit 1555abd

File tree

2 files changed

+1
-0
lines changed

2 files changed

+1
-0
lines changed

src/Models/ExternalMerger.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ static ExternalMerger()
4242
new ExternalMerger(7, "win_merge", "WinMerge", "WinMergeU.exe", "\"$MERGED\"", "-u -e -sw \"$LOCAL\" \"$REMOTE\""),
4343
new ExternalMerger(8, "codium", "VSCodium", "VSCodium.exe", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""),
4444
new ExternalMerger(9, "p4merge", "P4Merge", "p4merge.exe", "-tw 4 \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"", "-tw 4 \"$LOCAL\" \"$REMOTE\""),
45+
new ExternalMerger(10, "plastic_merge", "Plastic SCM", "mergetool.exe", "-s=\"$REMOTE\" -b=\"$BASE\" -d=\"$LOCAL\" -r=\"$MERGED\" --automatic", "-s=\"$LOCAL\" -d=\"$REMOTE\""),
4546
};
4647
}
4748
else if (OperatingSystem.IsMacOS())
6.22 KB
Loading

0 commit comments

Comments
 (0)