From 77978fe57e28ed3f314b741ee8a276fdabe0178b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tormod=20Fjeldsk=C3=A5r?= <tormod.fjeldskar@capgemini.com>
Date: Thu, 8 Oct 2020 17:35:00 +0200
Subject: [PATCH] Added Perforce Helix Visual Merge Tool (P4Merge) 2020.2
 (#4027)

---
 manifests/Perforce/P4Merge/2020.2.yaml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 manifests/Perforce/P4Merge/2020.2.yaml

diff --git a/manifests/Perforce/P4Merge/2020.2.yaml b/manifests/Perforce/P4Merge/2020.2.yaml
new file mode 100644
index 000000000..08c59b607
--- /dev/null
+++ b/manifests/Perforce/P4Merge/2020.2.yaml
@@ -0,0 +1,21 @@
+Id: Perforce.P4Merge
+Version: 2020.2
+Name: Helix Visual Merge Tool (P4Merge)
+Publisher: Perforce
+License: Copyright (c) Perforce Software, Inc.
+AppMoniker: p4merge
+Tags: merge, diff, compare
+Description: Helix Visual Merge Tool (P4Merge) is a three-way merging and side-by-side file comparison tool. Use it to visualize your merges, obtain comprehensive file history, and compare a broad range of image files.
+Homepage: https://www.perforce.com/products/helix-core-apps/merge-diff-tool-p4merge
+Installers:
+  - Arch: x64
+    Url: https://cdist2.perforce.com/perforce/r20.2/bin.ntx64/p4vinst64.exe
+    Sha256: A049DC408549187D547DA3CB4B7386727F9EEF87E4DF452E7968F7FD571A88C9
+    InstallerType: exe
+    Switches:
+      Silent: /silent
+      SilentWithProgress: /passive
+      Custom: REMOVEAPPS=P4ADMIN,P4V,P4
+      Interactive: ""
+      Log: /l <LOGPATH>
+      InstallLocation: INSTDIR=<INSTALLPATH>